waouh
This commit is contained in:
parent
70f799ea73
commit
ae2b3b106a
69
.gitea/workflows/deploy.yml
Normal file
69
.gitea/workflows/deploy.yml
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
name: Build and Deploy to k3s
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [ main, master ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ main, master ]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build-and-deploy:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
|
- name: Setup Node.js
|
||||||
|
uses: actions/setup-node@v3
|
||||||
|
with:
|
||||||
|
node-version: '18'
|
||||||
|
cache: 'npm'
|
||||||
|
|
||||||
|
- name: Install dependencies
|
||||||
|
run: npm ci
|
||||||
|
|
||||||
|
- name: Build Angular app
|
||||||
|
run: npm run build --prod
|
||||||
|
|
||||||
|
- name: Build Docker image
|
||||||
|
run: |
|
||||||
|
docker build -t ${{ secrets.REGISTRY_URL }}/angular-app:${{ github.sha }} .
|
||||||
|
docker tag ${{ secrets.REGISTRY_URL }}/angular-app:${{ github.sha }} ${{ secrets.REGISTRY_URL }}/angular-app:latest
|
||||||
|
|
||||||
|
- name: Login to Container Registry
|
||||||
|
run: echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ secrets.REGISTRY_URL }} -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
|
||||||
|
|
||||||
|
- name: Push Docker image
|
||||||
|
run: |
|
||||||
|
docker push ${{ secrets.REGISTRY_URL }}/angular-app:${{ github.sha }}
|
||||||
|
docker push ${{ secrets.REGISTRY_URL }}/angular-app:latest
|
||||||
|
|
||||||
|
- name: Setup kubectl
|
||||||
|
uses: azure/setup-kubectl@v3
|
||||||
|
with:
|
||||||
|
version: 'latest'
|
||||||
|
|
||||||
|
- name: Configure kubectl
|
||||||
|
run: |
|
||||||
|
mkdir -p ~/.kube
|
||||||
|
echo "${{ secrets.KUBECONFIG }}" | base64 -d > ~/.kube/config
|
||||||
|
chmod 600 ~/.kube/config
|
||||||
|
|
||||||
|
- name: Create ConfigMap for app files
|
||||||
|
run: |
|
||||||
|
kubectl create configmap angular-app-files \
|
||||||
|
--from-file=dist/your-angular-app/ \
|
||||||
|
--namespace=angular-app \
|
||||||
|
--dry-run=client -o yaml | kubectl apply -f -
|
||||||
|
|
||||||
|
- name: Create ConfigMap for nginx config
|
||||||
|
run: |
|
||||||
|
kubectl create configmap nginx-config \
|
||||||
|
--from-file=nginx.conf \
|
||||||
|
--namespace=angular-app \
|
||||||
|
--dry-run=client -o yaml | kubectl apply -f -
|
||||||
|
|
||||||
|
- name: Deploy to k3s
|
||||||
|
run: |
|
||||||
|
kubectl apply -f k8s/
|
||||||
|
kubectl set image deployment/angular-app angular-app=${{ secrets.REGISTRY_URL }}/angular-app:${{ github.sha }} -n angular-app
|
||||||
|
kubectl rollout status deployment/angular-app -n angular-app
|
||||||
@ -1,7 +1,5 @@
|
|||||||
module.exports = {
|
{
|
||||||
plugins: {
|
"plugins": {
|
||||||
tailwindcss: {},
|
"@tailwindcss/postcss": {}
|
||||||
autoprefixer: {},
|
}
|
||||||
},
|
}
|
||||||
};
|
|
||||||
|
|
||||||
|
|||||||
14
Dockerfile
Normal file
14
Dockerfile
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# Build stage
|
||||||
|
FROM node:22-alpine AS build
|
||||||
|
WORKDIR /app
|
||||||
|
COPY package*.json ./
|
||||||
|
RUN npm ci --only=production
|
||||||
|
COPY . .
|
||||||
|
RUN npm run build --prod
|
||||||
|
|
||||||
|
# Production stage
|
||||||
|
FROM nginx:alpine AS prod
|
||||||
|
COPY --from=build /app/dist/hosting-frontend/browser /usr/share/nginx/html
|
||||||
|
COPY ./deploy/nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
EXPOSE 80
|
||||||
|
CMD ["nginx", "-g", "daemon off;"]
|
||||||
@ -38,8 +38,8 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "anyComponentStyle",
|
"type": "anyComponentStyle",
|
||||||
"maximumWarning": "4kB",
|
"maximumWarning": "16kB",
|
||||||
"maximumError": "8kB"
|
"maximumError": "32kB"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"outputHashing": "all"
|
"outputHashing": "all"
|
||||||
|
|||||||
32
deploy/k8s/deployment.yaml
Normal file
32
deploy/k8s/deployment.yaml
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
apiVersion: apps/v1
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: hosting-frontend
|
||||||
|
namespace: hosting
|
||||||
|
spec:
|
||||||
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: hosting-frontend
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app: hosting-frontend
|
||||||
|
spec:
|
||||||
|
containers:
|
||||||
|
- name: hosting-frontend
|
||||||
|
image: nginx:alpine
|
||||||
|
ports:
|
||||||
|
- containerPort: 80
|
||||||
|
volumeMounts:
|
||||||
|
- name: app-volume
|
||||||
|
mountPath: /usr/share/nginx/html
|
||||||
|
- name: nginx-config
|
||||||
|
mountPath: /etc/nginx/conf.d
|
||||||
|
volumes:
|
||||||
|
- name: app-volume
|
||||||
|
configMap:
|
||||||
|
name: hosting-files
|
||||||
|
- name: nginx-config
|
||||||
|
configMap:
|
||||||
|
name: nginx-config
|
||||||
19
deploy/k8s/ingress.yaml
Normal file
19
deploy/k8s/ingress.yaml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: hosting-ingress
|
||||||
|
namespace: hosting
|
||||||
|
annotations:
|
||||||
|
kubernetes.io/ingress.class: traefik
|
||||||
|
spec:
|
||||||
|
rules:
|
||||||
|
- host: hosting.local
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- path: /
|
||||||
|
pathType: Prefix
|
||||||
|
backend:
|
||||||
|
service:
|
||||||
|
name: hosting-frontend-service
|
||||||
|
port:
|
||||||
|
number: 80
|
||||||
4
deploy/k8s/namespace.yaml
Normal file
4
deploy/k8s/namespace.yaml
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Namespace
|
||||||
|
metadata:
|
||||||
|
name: hosting
|
||||||
12
deploy/k8s/service.yaml
Normal file
12
deploy/k8s/service.yaml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: Service
|
||||||
|
metadata:
|
||||||
|
name: hosting-frontend-service
|
||||||
|
namespace: hosting
|
||||||
|
spec:
|
||||||
|
selector:
|
||||||
|
app: hosting-frontend
|
||||||
|
ports:
|
||||||
|
- port: 80
|
||||||
|
targetPort: 80
|
||||||
|
type: ClusterIP
|
||||||
15
deploy/nginx.conf
Normal file
15
deploy/nginx.conf
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
server {
|
||||||
|
listen 80;
|
||||||
|
server_name localhost;
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html;
|
||||||
|
|
||||||
|
location / {
|
||||||
|
try_files $uri $uri/ /index.html;
|
||||||
|
}
|
||||||
|
|
||||||
|
location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg)$ {
|
||||||
|
expires 1y;
|
||||||
|
add_header Cache-Control "public, immutable";
|
||||||
|
}
|
||||||
|
}
|
||||||
737
package-lock.json
generated
737
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -16,6 +16,8 @@
|
|||||||
"@angular/forms": "^20.0.0",
|
"@angular/forms": "^20.0.0",
|
||||||
"@angular/platform-browser": "^20.0.0",
|
"@angular/platform-browser": "^20.0.0",
|
||||||
"@angular/router": "^20.0.0",
|
"@angular/router": "^20.0.0",
|
||||||
|
"@tailwindcss/cli": "^4.1.8",
|
||||||
|
"@tailwindcss/postcss": "^4.1.8",
|
||||||
"rxjs": "~7.8.0",
|
"rxjs": "~7.8.0",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"zone.js": "~0.15.0"
|
"zone.js": "~0.15.0"
|
||||||
@ -25,12 +27,15 @@
|
|||||||
"@angular/cli": "^20.0.0",
|
"@angular/cli": "^20.0.0",
|
||||||
"@angular/compiler-cli": "^20.0.0",
|
"@angular/compiler-cli": "^20.0.0",
|
||||||
"@types/jasmine": "~5.1.0",
|
"@types/jasmine": "~5.1.0",
|
||||||
|
"autoprefixer": "^10.4.21",
|
||||||
"jasmine-core": "~5.7.0",
|
"jasmine-core": "~5.7.0",
|
||||||
"karma": "~6.4.0",
|
"karma": "~6.4.0",
|
||||||
"karma-chrome-launcher": "~3.2.0",
|
"karma-chrome-launcher": "~3.2.0",
|
||||||
"karma-coverage": "~2.2.0",
|
"karma-coverage": "~2.2.0",
|
||||||
"karma-jasmine": "~5.1.0",
|
"karma-jasmine": "~5.1.0",
|
||||||
"karma-jasmine-html-reporter": "~2.1.0",
|
"karma-jasmine-html-reporter": "~2.1.0",
|
||||||
|
"postcss": "^8.5.4",
|
||||||
|
"tailwindcss": "^4.1.8",
|
||||||
"typescript": "~5.8.2"
|
"typescript": "~5.8.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1 @@
|
|||||||
|
@import "tailwindcss";
|
||||||
335
src/app/app.html
335
src/app/app.html
@ -1,336 +1 @@
|
|||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * The content below * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * Delete the template below * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * to get started with your project! * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
<style>
|
|
||||||
:host {
|
|
||||||
--bright-blue: oklch(51.01% 0.274 263.83);
|
|
||||||
--electric-violet: oklch(53.18% 0.28 296.97);
|
|
||||||
--french-violet: oklch(47.66% 0.246 305.88);
|
|
||||||
--vivid-pink: oklch(69.02% 0.277 332.77);
|
|
||||||
--hot-red: oklch(61.42% 0.238 15.34);
|
|
||||||
--orange-red: oklch(63.32% 0.24 31.68);
|
|
||||||
|
|
||||||
--gray-900: oklch(19.37% 0.006 300.98);
|
|
||||||
--gray-700: oklch(36.98% 0.014 302.71);
|
|
||||||
--gray-400: oklch(70.9% 0.015 304.04);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-vertical-gradient: linear-gradient(
|
|
||||||
180deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--red-to-pink-to-purple-horizontal-gradient: linear-gradient(
|
|
||||||
90deg,
|
|
||||||
var(--orange-red) 0%,
|
|
||||||
var(--vivid-pink) 50%,
|
|
||||||
var(--electric-violet) 100%
|
|
||||||
);
|
|
||||||
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
|
|
||||||
font-family: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
box-sizing: border-box;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
-moz-osx-font-smoothing: grayscale;
|
|
||||||
}
|
|
||||||
|
|
||||||
h1 {
|
|
||||||
font-size: 3.125rem;
|
|
||||||
color: var(--gray-900);
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 100%;
|
|
||||||
letter-spacing: -0.125rem;
|
|
||||||
margin: 0;
|
|
||||||
font-family: "Inter Tight", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
|
|
||||||
Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
|
|
||||||
"Segoe UI Symbol";
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--gray-700);
|
|
||||||
}
|
|
||||||
|
|
||||||
main {
|
|
||||||
width: 100%;
|
|
||||||
min-height: 100%;
|
|
||||||
display: flex;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
padding: 1rem;
|
|
||||||
box-sizing: inherit;
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.angular-logo {
|
|
||||||
max-width: 9.2rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-around;
|
|
||||||
width: 100%;
|
|
||||||
max-width: 700px;
|
|
||||||
margin-bottom: 3rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content h1 {
|
|
||||||
margin-top: 1.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.content p {
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
width: 1px;
|
|
||||||
background: var(--red-to-pink-to-purple-vertical-gradient);
|
|
||||||
margin-inline: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: start;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 1.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 5%, transparent);
|
|
||||||
color: var(--pill-accent);
|
|
||||||
padding-inline: 0.75rem;
|
|
||||||
padding-block: 0.375rem;
|
|
||||||
border-radius: 2.75rem;
|
|
||||||
border: 0;
|
|
||||||
transition: background 0.3s ease;
|
|
||||||
font-family: var(--inter-font);
|
|
||||||
font-size: 0.875rem;
|
|
||||||
font-style: normal;
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 1.4rem;
|
|
||||||
letter-spacing: -0.00875rem;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill:hover {
|
|
||||||
background: color-mix(in srgb, var(--pill-accent) 15%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group .pill:nth-child(6n + 1) {
|
|
||||||
--pill-accent: var(--bright-blue);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 2) {
|
|
||||||
--pill-accent: var(--french-violet);
|
|
||||||
}
|
|
||||||
.pill-group .pill:nth-child(6n + 3),
|
|
||||||
.pill-group .pill:nth-child(6n + 4),
|
|
||||||
.pill-group .pill:nth-child(6n + 5) {
|
|
||||||
--pill-accent: var(--hot-red);
|
|
||||||
}
|
|
||||||
|
|
||||||
.pill-group svg {
|
|
||||||
margin-inline-start: 0.25rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.73rem;
|
|
||||||
margin-top: 1.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links path {
|
|
||||||
transition: fill 0.3s ease;
|
|
||||||
fill: var(--gray-400);
|
|
||||||
}
|
|
||||||
|
|
||||||
.social-links a:hover svg path {
|
|
||||||
fill: var(--gray-900);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 650px) {
|
|
||||||
.content {
|
|
||||||
flex-direction: column;
|
|
||||||
width: max-content;
|
|
||||||
}
|
|
||||||
|
|
||||||
.divider {
|
|
||||||
height: 1px;
|
|
||||||
width: 100%;
|
|
||||||
background: var(--red-to-pink-to-purple-horizontal-gradient);
|
|
||||||
margin-block: 1.5rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
<main class="main">
|
|
||||||
<div class="content">
|
|
||||||
<div class="left-side">
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
viewBox="0 0 982 239"
|
|
||||||
fill="none"
|
|
||||||
class="angular-logo"
|
|
||||||
>
|
|
||||||
<g clip-path="url(#a)">
|
|
||||||
<path
|
|
||||||
fill="url(#b)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
<path
|
|
||||||
fill="url(#c)"
|
|
||||||
d="M388.676 191.625h30.849L363.31 31.828h-35.758l-56.215 159.797h30.848l13.174-39.356h60.061l13.256 39.356Zm-65.461-62.675 21.602-64.311h1.227l21.602 64.311h-44.431Zm126.831-7.527v70.202h-28.23V71.839h27.002v20.374h1.392c2.782-6.71 7.2-12.028 13.255-15.956 6.056-3.927 13.584-5.89 22.503-5.89 8.264 0 15.465 1.8 21.684 5.318 6.137 3.518 10.964 8.673 14.319 15.382 3.437 6.71 5.074 14.81 4.992 24.383v76.175h-28.23v-71.92c0-8.019-2.046-14.237-6.219-18.819-4.173-4.5-9.819-6.791-17.102-6.791-4.91 0-9.328 1.063-13.174 3.272-3.846 2.128-6.792 5.237-9.001 9.328-2.046 4.009-3.191 8.918-3.191 14.728ZM589.233 239c-10.147 0-18.82-1.391-26.103-4.091-7.282-2.7-13.092-6.382-17.511-10.964-4.418-4.582-7.528-9.655-9.164-15.219l25.448-6.136c1.145 2.372 2.782 4.663 4.991 6.954 2.209 2.291 5.155 4.255 8.837 5.81 3.683 1.554 8.428 2.291 14.074 2.291 8.019 0 14.647-1.964 19.884-5.81 5.237-3.845 7.856-10.227 7.856-19.064v-22.665h-1.391c-1.473 2.946-3.601 5.892-6.383 9.001-2.782 3.109-6.464 5.645-10.965 7.691-4.582 2.046-10.228 3.109-17.101 3.109-9.165 0-17.511-2.209-25.039-6.545-7.446-4.337-13.42-10.883-17.757-19.474-4.418-8.673-6.628-19.473-6.628-32.565 0-13.091 2.21-24.301 6.628-33.383 4.419-9.082 10.311-15.955 17.839-20.7 7.528-4.746 15.874-7.037 25.039-7.037 7.037 0 12.846 1.145 17.347 3.518 4.582 2.373 8.182 5.236 10.883 8.51 2.7 3.272 4.746 6.382 6.137 9.327h1.554v-19.8h27.821v121.749c0 10.228-2.454 18.737-7.364 25.447-4.91 6.709-11.538 11.7-20.048 15.055-8.509 3.355-18.165 4.991-28.884 4.991Zm.245-71.266c5.974 0 11.047-1.473 15.302-4.337 4.173-2.945 7.446-7.118 9.573-12.519 2.21-5.482 3.274-12.027 3.274-19.637 0-7.609-1.064-14.155-3.274-19.8-2.127-5.646-5.318-10.064-9.491-13.255-4.174-3.11-9.329-4.746-15.384-4.746s-11.537 1.636-15.792 4.91c-4.173 3.272-7.365 7.772-9.492 13.418-2.128 5.727-3.191 12.191-3.191 19.392 0 7.2 1.063 13.745 3.273 19.228 2.127 5.482 5.318 9.736 9.573 12.764 4.174 3.027 9.41 4.582 15.629 4.582Zm141.56-26.51V71.839h28.23v119.786h-27.412v-21.273h-1.227c-2.7 6.709-7.119 12.191-13.338 16.446-6.137 4.255-13.747 6.382-22.748 6.382-7.855 0-14.81-1.718-20.783-5.237-5.974-3.518-10.72-8.591-14.075-15.382-3.355-6.709-5.073-14.891-5.073-24.464V71.839h28.312v71.921c0 7.609 2.046 13.664 6.219 18.083 4.173 4.5 9.655 6.709 16.365 6.709 4.173 0 8.183-.982 12.111-3.028 3.927-2.045 7.118-5.072 9.655-9.082 2.537-4.091 3.764-9.164 3.764-15.218Zm65.707-109.395v159.796h-28.23V31.828h28.23Zm44.841 162.169c-7.61 0-14.402-1.391-20.457-4.091-6.055-2.7-10.883-6.791-14.32-12.109-3.518-5.319-5.237-11.946-5.237-19.801 0-6.791 1.228-12.355 3.765-16.773 2.536-4.419 5.891-7.937 10.228-10.637 4.337-2.618 9.164-4.664 14.647-6.055 5.4-1.391 11.046-2.373 16.856-3.027 7.037-.737 12.683-1.391 17.102-1.964 4.337-.573 7.528-1.555 9.574-2.782 1.963-1.309 3.027-3.273 3.027-5.973v-.491c0-5.891-1.718-10.391-5.237-13.664-3.518-3.191-8.51-4.828-15.056-4.828-6.955 0-12.356 1.473-16.447 4.5-4.009 3.028-6.71 6.546-8.183 10.719l-26.348-3.764c2.046-7.282 5.483-13.336 10.31-18.328 4.746-4.909 10.638-8.59 17.511-11.045 6.955-2.455 14.565-3.682 22.912-3.682 5.809 0 11.537.654 17.265 2.045s10.965 3.6 15.711 6.71c4.746 3.109 8.51 7.282 11.455 12.6 2.864 5.318 4.337 11.946 4.337 19.883v80.184h-27.166v-16.446h-.9c-1.719 3.355-4.092 6.464-7.201 9.328-3.109 2.864-6.955 5.237-11.619 6.955-4.828 1.718-10.229 2.536-16.529 2.536Zm7.364-20.701c5.646 0 10.556-1.145 14.729-3.354 4.173-2.291 7.364-5.237 9.655-9.001 2.292-3.763 3.355-7.854 3.355-12.273v-14.155c-.9.737-2.373 1.391-4.5 2.046-2.128.654-4.419 1.145-7.037 1.636-2.619.491-5.155.9-7.692 1.227-2.537.328-4.746.655-6.628.901-4.173.572-8.019 1.472-11.292 2.781-3.355 1.31-5.973 3.11-7.855 5.401-1.964 2.291-2.864 5.318-2.864 8.918 0 5.237 1.882 9.164 5.728 11.782 3.682 2.782 8.51 4.091 14.401 4.091Zm64.643 18.328V71.839h27.412v19.965h1.227c2.21-6.955 5.974-12.274 11.292-16.038 5.319-3.763 11.456-5.645 18.329-5.645 1.555 0 3.355.082 5.237.163 1.964.164 3.601.328 4.91.573v25.938c-1.227-.41-3.109-.819-5.646-1.146a58.814 58.814 0 0 0-7.446-.49c-5.155 0-9.738 1.145-13.829 3.354-4.091 2.209-7.282 5.236-9.655 9.164-2.373 3.927-3.519 8.427-3.519 13.5v70.448h-28.312ZM222.077 39.192l-8.019 125.923L137.387 0l84.69 39.192Zm-53.105 162.825-57.933 33.056-57.934-33.056 11.783-28.556h92.301l11.783 28.556ZM111.039 62.675l30.357 73.803H80.681l30.358-73.803ZM7.937 165.115 0 39.192 84.69 0 7.937 165.115Z"
|
|
||||||
/>
|
|
||||||
</g>
|
|
||||||
<defs>
|
|
||||||
<radialGradient
|
|
||||||
id="c"
|
|
||||||
cx="0"
|
|
||||||
cy="0"
|
|
||||||
r="1"
|
|
||||||
gradientTransform="rotate(118.122 171.182 60.81) scale(205.794)"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#FF41F8" />
|
|
||||||
<stop offset=".707" stop-color="#FF41F8" stop-opacity=".5" />
|
|
||||||
<stop offset="1" stop-color="#FF41F8" stop-opacity="0" />
|
|
||||||
</radialGradient>
|
|
||||||
<linearGradient
|
|
||||||
id="b"
|
|
||||||
x1="0"
|
|
||||||
x2="982"
|
|
||||||
y1="192"
|
|
||||||
y2="192"
|
|
||||||
gradientUnits="userSpaceOnUse"
|
|
||||||
>
|
|
||||||
<stop stop-color="#F0060B" />
|
|
||||||
<stop offset="0" stop-color="#F0070C" />
|
|
||||||
<stop offset=".526" stop-color="#CC26D5" />
|
|
||||||
<stop offset="1" stop-color="#7702FF" />
|
|
||||||
</linearGradient>
|
|
||||||
<clipPath id="a"><path fill="#fff" d="M0 0h982v239H0z" /></clipPath>
|
|
||||||
</defs>
|
|
||||||
</svg>
|
|
||||||
<h1>Hello, {{ title }}</h1>
|
|
||||||
<p>Congratulations! Your app is running. 🎉</p>
|
|
||||||
</div>
|
|
||||||
<div class="divider" role="separator" aria-label="Divider"></div>
|
|
||||||
<div class="right-side">
|
|
||||||
<div class="pill-group">
|
|
||||||
@for (item of [
|
|
||||||
{ title: 'Explore the Docs', link: 'https://angular.dev' },
|
|
||||||
{ title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' },
|
|
||||||
{ title: 'CLI Docs', link: 'https://angular.dev/tools/cli' },
|
|
||||||
{ title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' },
|
|
||||||
{ title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' },
|
|
||||||
]; track item.title) {
|
|
||||||
<a
|
|
||||||
class="pill"
|
|
||||||
[href]="item.link"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<span>{{ item.title }}</span>
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
height="14"
|
|
||||||
viewBox="0 -960 960 960"
|
|
||||||
width="14"
|
|
||||||
fill="currentColor"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
<div class="social-links">
|
|
||||||
<a
|
|
||||||
href="https://github.com/angular/angular"
|
|
||||||
aria-label="Github"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="25"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 25 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Github"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M12.3047 0C5.50634 0 0 5.50942 0 12.3047C0 17.7423 3.52529 22.3535 8.41332 23.9787C9.02856 24.0946 9.25414 23.7142 9.25414 23.3871C9.25414 23.0949 9.24389 22.3207 9.23876 21.2953C5.81601 22.0377 5.09414 19.6444 5.09414 19.6444C4.53427 18.2243 3.72524 17.8449 3.72524 17.8449C2.61064 17.082 3.81137 17.0973 3.81137 17.0973C5.04697 17.1835 5.69604 18.3647 5.69604 18.3647C6.79321 20.2463 8.57636 19.7029 9.27978 19.3881C9.39052 18.5924 9.70736 18.0499 10.0591 17.7423C7.32641 17.4347 4.45429 16.3765 4.45429 11.6618C4.45429 10.3185 4.9311 9.22133 5.72065 8.36C5.58222 8.04931 5.16694 6.79833 5.82831 5.10337C5.82831 5.10337 6.85883 4.77319 9.2121 6.36459C10.1965 6.09082 11.2424 5.95546 12.2883 5.94931C13.3342 5.95546 14.3801 6.09082 15.3644 6.36459C17.7023 4.77319 18.7328 5.10337 18.7328 5.10337C19.3942 6.79833 18.9789 8.04931 18.8559 8.36C19.6403 9.22133 20.1171 10.3185 20.1171 11.6618C20.1171 16.3888 17.2409 17.4296 14.5031 17.7321C14.9338 18.1012 15.3337 18.8559 15.3337 20.0084C15.3337 21.6552 15.3183 22.978 15.3183 23.3779C15.3183 23.7009 15.5336 24.0854 16.1642 23.9623C21.0871 22.3484 24.6094 17.7341 24.6094 12.3047C24.6094 5.50942 19.0999 0 12.3047 0Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://twitter.com/angular"
|
|
||||||
aria-label="Twitter"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="24"
|
|
||||||
height="24"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Twitter"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
<a
|
|
||||||
href="https://www.youtube.com/channel/UCbn1OgGei-DV7aSRo_HaAiw"
|
|
||||||
aria-label="Youtube"
|
|
||||||
target="_blank"
|
|
||||||
rel="noopener"
|
|
||||||
>
|
|
||||||
<svg
|
|
||||||
width="29"
|
|
||||||
height="20"
|
|
||||||
viewBox="0 0 29 20"
|
|
||||||
fill="none"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
alt="Youtube"
|
|
||||||
>
|
|
||||||
<path
|
|
||||||
fill-rule="evenodd"
|
|
||||||
clip-rule="evenodd"
|
|
||||||
d="M27.4896 1.52422C27.9301 1.96749 28.2463 2.51866 28.4068 3.12258C29.0004 5.35161 29.0004 10 29.0004 10C29.0004 10 29.0004 14.6484 28.4068 16.8774C28.2463 17.4813 27.9301 18.0325 27.4896 18.4758C27.0492 18.9191 26.5 19.2389 25.8972 19.4032C23.6778 20 14.8068 20 14.8068 20C14.8068 20 5.93586 20 3.71651 19.4032C3.11363 19.2389 2.56449 18.9191 2.12405 18.4758C1.68361 18.0325 1.36732 17.4813 1.20683 16.8774C0.613281 14.6484 0.613281 10 0.613281 10C0.613281 10 0.613281 5.35161 1.20683 3.12258C1.36732 2.51866 1.68361 1.96749 2.12405 1.52422C2.56449 1.08095 3.11363 0.76113 3.71651 0.596774C5.93586 0 14.8068 0 14.8068 0C14.8068 0 23.6778 0 25.8972 0.596774C26.5 0.76113 27.0492 1.08095 27.4896 1.52422ZM19.3229 10L11.9036 5.77905V14.221L19.3229 10Z"
|
|
||||||
/>
|
|
||||||
</svg>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * The content above * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * is only a placeholder * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * and can be replaced. * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * End of Placeholder * * * * * * * * * * * * -->
|
|
||||||
<!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
|
|
||||||
|
|
||||||
|
|
||||||
<router-outlet />
|
<router-outlet />
|
||||||
|
|||||||
@ -1,3 +1,17 @@
|
|||||||
import { Routes } from '@angular/router';
|
import { Routes } from '@angular/router';
|
||||||
|
import {LoginComponent} from './components/login/login.component';
|
||||||
|
import {RegisterComponent} from './components/register/register.component';
|
||||||
|
export const routes: Routes = [
|
||||||
|
|
||||||
export const routes: Routes = [];
|
{
|
||||||
|
path: 'login',
|
||||||
|
component: LoginComponent,
|
||||||
|
title: 'Login - Your App Name'
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
path: 'register',
|
||||||
|
component: RegisterComponent,
|
||||||
|
title: 'Register - Your App Name'
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|||||||
0
src/app/components/login/login.component.css
Normal file
0
src/app/components/login/login.component.css
Normal file
121
src/app/components/login/login.component.html
Normal file
121
src/app/components/login/login.component.html
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
<div class="min-h-screen bg-gradient-to-tr from-indigo-600 via-purple-700 to-pink-600 flex items-center justify-center p-6 font-sans">
|
||||||
|
<div class="bg-white rounded-xl shadow-lg max-w-md w-full p-8 animate-fadeIn">
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="mb-8 text-center">
|
||||||
|
<h1 class="text-3xl font-extrabold text-gray-900 mb-2">Welcome Back</h1>
|
||||||
|
<p class="text-gray-600">Please sign in to your account</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Success Message -->
|
||||||
|
@if (success) {
|
||||||
|
<div class="mb-6 p-4 bg-green-100 border border-green-400 text-green-800 rounded flex items-center gap-2" role="alert">
|
||||||
|
<svg class="w-6 h-6 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path d="M9 12l2 2 4-4" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
|
||||||
|
</svg>
|
||||||
|
<span>{{ success }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Error Message -->
|
||||||
|
@if (error) {
|
||||||
|
<div class="mb-6 p-4 bg-red-100 border border-red-400 text-red-800 rounded flex items-center gap-2" role="alert">
|
||||||
|
<svg class="w-6 h-6 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path d="M6 18L18 6M6 6l12 12" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
|
||||||
|
</svg>
|
||||||
|
<span>{{ error }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<!-- Login Form -->
|
||||||
|
<form (ngSubmit)="onSubmit()" [formGroup]="loginForm" class="space-y-6" novalidate>
|
||||||
|
|
||||||
|
<!-- Email Field -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="email">Email Address</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('email')}"
|
||||||
|
autocomplete="email"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="email"
|
||||||
|
id="email"
|
||||||
|
placeholder="Enter your email"
|
||||||
|
type="email"
|
||||||
|
/>
|
||||||
|
@if (hasFieldError('email')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('email') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Password Field -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="password">Password</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('password')}"
|
||||||
|
[type]="showPassword ? 'text' : 'password'"
|
||||||
|
autocomplete="current-password"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="password"
|
||||||
|
id="password"
|
||||||
|
placeholder="Enter your password"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
(click)="togglePasswordVisibility()"
|
||||||
|
[attr.aria-label]="showPassword ? 'Hide password' : 'Show password'"
|
||||||
|
class="absolute right-4 top-10"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<i [class]="showPassword ? 'fas fa-eye-slash' : 'fas fa-eye'"></i>
|
||||||
|
</button>
|
||||||
|
@if (hasFieldError('password')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('password') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Remember Me & Forgot Password -->
|
||||||
|
<div class="flex justify-between items-center">
|
||||||
|
<label class="flex items-center">
|
||||||
|
<input
|
||||||
|
class="checkbox-input"
|
||||||
|
formControlName="rememberMe"
|
||||||
|
type="checkbox"
|
||||||
|
/>
|
||||||
|
<span class="ml-2 text-sm text-gray-600">Remember me</span>
|
||||||
|
</label>
|
||||||
|
<button
|
||||||
|
(click)="goToForgotPassword()"
|
||||||
|
class="text-sm text-indigo-600 hover:text-indigo-700 focus:outline-none"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Forgot password?
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Submit Button -->
|
||||||
|
<button
|
||||||
|
[disabled]="loading"
|
||||||
|
class="w-full flex justify-center items-center gap-2 rounded-lg bg-indigo-600 hover:bg-indigo-700 disabled:bg-indigo-300 disabled:cursor-not-allowed text-white font-semibold py-3 transition"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
@if (loading) {
|
||||||
|
<svg class="animate-spin h-5 w-5 text-white" fill="none" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||||
|
<path class="opacity-75" d="M4 12a8 8 0 018-8v8H4z" fill="currentColor"></path>
|
||||||
|
</svg>
|
||||||
|
<span>Signing in...</span>
|
||||||
|
} @else {
|
||||||
|
<span>Sign In</span>
|
||||||
|
}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- Footer -->
|
||||||
|
<div class="mt-6 text-center text-sm text-gray-600">
|
||||||
|
Don't have an account?
|
||||||
|
<button (click)="goToRegister()" class="font-semibold text-indigo-600 hover:text-indigo-700 focus:outline-none" type="button">
|
||||||
|
Sign up here
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
23
src/app/components/login/login.component.spec.ts
Normal file
23
src/app/components/login/login.component.spec.ts
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import {ComponentFixture, TestBed} from '@angular/core/testing';
|
||||||
|
|
||||||
|
import {LoginComponent} from './login.component';
|
||||||
|
|
||||||
|
describe('Login', () => {
|
||||||
|
let component: LoginComponent;
|
||||||
|
let fixture: ComponentFixture<LoginComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [LoginComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(LoginComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
190
src/app/components/login/login.component.ts
Normal file
190
src/app/components/login/login.component.ts
Normal file
@ -0,0 +1,190 @@
|
|||||||
|
import {Component, OnInit, OnDestroy} from '@angular/core';
|
||||||
|
import {FormBuilder, FormGroup, ReactiveFormsModule, Validators} from '@angular/forms';
|
||||||
|
import {Router, ActivatedRoute} from '@angular/router';
|
||||||
|
import {Subject} from 'rxjs';
|
||||||
|
import {takeUntil} from 'rxjs/operators';
|
||||||
|
import {ApiService, LoginCredentials} from '../../services/api';
|
||||||
|
import {NgClass} from '@angular/common';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-login',
|
||||||
|
templateUrl: './login.component.html',
|
||||||
|
imports: [
|
||||||
|
ReactiveFormsModule,
|
||||||
|
NgClass
|
||||||
|
],
|
||||||
|
styleUrls: ['./login.component.css']
|
||||||
|
})
|
||||||
|
export class LoginComponent implements OnInit, OnDestroy {
|
||||||
|
loginForm: FormGroup;
|
||||||
|
loading = false;
|
||||||
|
error = '';
|
||||||
|
success = '';
|
||||||
|
showPassword = false;
|
||||||
|
returnUrl = '';
|
||||||
|
|
||||||
|
private destroy$ = new Subject<void>();
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private formBuilder: FormBuilder,
|
||||||
|
private apiService: ApiService,
|
||||||
|
private router: Router,
|
||||||
|
private route: ActivatedRoute
|
||||||
|
) {
|
||||||
|
// Redirect to dashboard if already logged in
|
||||||
|
if (this.apiService.isAuthenticated) {
|
||||||
|
this.router.navigate(['/dashboard']);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.loginForm = this.formBuilder.group({
|
||||||
|
email: ['', [Validators.required, Validators.email]],
|
||||||
|
password: ['', [Validators.required, Validators.minLength(6)]],
|
||||||
|
rememberMe: [false]
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
// Get return url from route parameters or default to dashboard
|
||||||
|
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/dashboard';
|
||||||
|
|
||||||
|
// Clear any existing error messages
|
||||||
|
this.clearMessages();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.destroy$.next();
|
||||||
|
this.destroy$.complete();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Getter for easy access to form fields
|
||||||
|
get f() {
|
||||||
|
return this.loginForm.controls;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get specific field error message
|
||||||
|
getFieldError(fieldName: string): string {
|
||||||
|
const field = this.loginForm.get(fieldName);
|
||||||
|
if (field?.errors && field.touched) {
|
||||||
|
if (field.errors['required']) {
|
||||||
|
return `${this.capitalizeFirst(fieldName)} is required`;
|
||||||
|
}
|
||||||
|
if (field.errors['email']) {
|
||||||
|
return 'Please enter a valid email address';
|
||||||
|
}
|
||||||
|
if (field.errors['minlength']) {
|
||||||
|
return `${this.capitalizeFirst(fieldName)} must be at least ${field.errors['minlength'].requiredLength} characters`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if field has error
|
||||||
|
hasFieldError(fieldName: string): boolean {
|
||||||
|
const field = this.loginForm.get(fieldName);
|
||||||
|
return !!(field?.errors && field.touched);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Capitalize first letter
|
||||||
|
private capitalizeFirst(str: string): string {
|
||||||
|
return str.charAt(0).toUpperCase() + str.slice(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Toggle password visibility
|
||||||
|
togglePasswordVisibility(): void {
|
||||||
|
this.showPassword = !this.showPassword;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear error and success messages
|
||||||
|
clearMessages(): void {
|
||||||
|
this.error = '';
|
||||||
|
this.success = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle form submission
|
||||||
|
onSubmit(): void {
|
||||||
|
this.clearMessages();
|
||||||
|
|
||||||
|
// Mark all fields as touched to show validation errors
|
||||||
|
this.loginForm.markAllAsTouched();
|
||||||
|
|
||||||
|
if (this.loginForm.invalid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.loading = true;
|
||||||
|
|
||||||
|
const credentials: LoginCredentials = {
|
||||||
|
email: this.f['email'].value,
|
||||||
|
password: this.f['password'].value
|
||||||
|
};
|
||||||
|
|
||||||
|
this.apiService.login(credentials)
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe({
|
||||||
|
next: (response) => {
|
||||||
|
this.loading = false;
|
||||||
|
|
||||||
|
if (response.success) {
|
||||||
|
this.success = 'Login successful! Redirecting...';
|
||||||
|
|
||||||
|
// Store remember me preference if needed
|
||||||
|
if (this.f['rememberMe'].value) {
|
||||||
|
localStorage.setItem('rememberMe', 'true');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Redirect after a short delay to show success message
|
||||||
|
setTimeout(() => {
|
||||||
|
this.router.navigate([this.returnUrl]);
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
} else {
|
||||||
|
this.error = response.message || 'Login failed. Please try again.';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: (error) => {
|
||||||
|
this.loading = false;
|
||||||
|
|
||||||
|
// Handle specific error cases
|
||||||
|
if (error.status === 422 && error.error?.errors) {
|
||||||
|
// Validation errors from server
|
||||||
|
const serverErrors = error.error.errors;
|
||||||
|
let errorMessages: string[] = [];
|
||||||
|
|
||||||
|
Object.keys(serverErrors).forEach(key => {
|
||||||
|
if (Array.isArray(serverErrors[key])) {
|
||||||
|
errorMessages = errorMessages.concat(serverErrors[key]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.error = errorMessages.join(', ');
|
||||||
|
} else if (error.status === 401) {
|
||||||
|
this.error = 'Invalid email or password. Please try again.';
|
||||||
|
} else {
|
||||||
|
this.error = error.userMessage || 'An error occurred. Please try again.';
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error('Login error:', error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Navigate to register page
|
||||||
|
goToRegister(): void {
|
||||||
|
this.router.navigate(['/register'], {
|
||||||
|
queryParams: {returnUrl: this.returnUrl}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Navigate to forgot password page
|
||||||
|
goToForgotPassword(): void {
|
||||||
|
this.router.navigate(['/forgot-password']);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Demo login (optional - for testing)
|
||||||
|
demoLogin(): void {
|
||||||
|
this.loginForm.patchValue({
|
||||||
|
email: 'demo@example.com',
|
||||||
|
password: 'password123'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
0
src/app/components/register/register.component.css
Normal file
0
src/app/components/register/register.component.css
Normal file
137
src/app/components/register/register.component.html
Normal file
137
src/app/components/register/register.component.html
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
<div
|
||||||
|
class="min-h-screen bg-gradient-to-tr from-indigo-600 via-purple-700 to-pink-600 flex items-center justify-center p-6 font-sans">
|
||||||
|
<div class="bg-white rounded-xl shadow-lg max-w-md w-full p-8 animate-fadeIn">
|
||||||
|
<!-- Header -->
|
||||||
|
<div class="mb-8 text-center">
|
||||||
|
<h1 class="text-3xl font-extrabold text-gray-900 mb-2">Create your account</h1>
|
||||||
|
<p class="text-gray-600">Sign up to get started!</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Success message -->
|
||||||
|
@if (success) {
|
||||||
|
<div class="mb-6 p-4 bg-green-100 border border-green-400 text-green-800 rounded flex items-center gap-2"
|
||||||
|
role="alert">
|
||||||
|
<svg class="w-6 h-6 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path d="M9 12l2 2 4-4" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
|
||||||
|
</svg>
|
||||||
|
<span>{{ success }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Error message -->
|
||||||
|
@if (error) {
|
||||||
|
<div class="mb-6 p-4 bg-red-100 border border-red-400 text-red-800 rounded flex items-center gap-2"
|
||||||
|
role="alert">
|
||||||
|
<svg class="w-6 h-6 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
|
||||||
|
<path d="M6 18L18 6M6 6l12 12" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
|
||||||
|
</svg>
|
||||||
|
<span>{{ error }}</span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
<form (ngSubmit)="onSubmit()" [formGroup]="registerForm" class="space-y-6" novalidate>
|
||||||
|
<!-- Name -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="name">Name</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('name')}"
|
||||||
|
autocomplete="name"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="name"
|
||||||
|
id="name"
|
||||||
|
placeholder="Enter your full name"
|
||||||
|
type="text"
|
||||||
|
/>
|
||||||
|
@if (hasFieldError('name')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('name') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Email -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="email">Email Address</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('email')}"
|
||||||
|
autocomplete="email"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="email"
|
||||||
|
id="email"
|
||||||
|
placeholder="Enter your email"
|
||||||
|
type="email"
|
||||||
|
/>
|
||||||
|
@if (hasFieldError('email')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('email') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Password -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="password">Password</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('password')}"
|
||||||
|
autocomplete="new-password"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="password"
|
||||||
|
id="password"
|
||||||
|
placeholder="Create a password"
|
||||||
|
type="password"
|
||||||
|
/>
|
||||||
|
@if (hasFieldError('password')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('password') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Confirm Password -->
|
||||||
|
<div>
|
||||||
|
<label class="block text-sm font-semibold text-gray-700 mb-1" for="password_confirmation">Confirm
|
||||||
|
Password</label>
|
||||||
|
<input
|
||||||
|
(input)="clearMessages()"
|
||||||
|
[ngClass]="{'border-red-500': hasFieldError('password_confirmation')}"
|
||||||
|
autocomplete="new-password"
|
||||||
|
class="w-full rounded-md border border-gray-300 px-4 py-3 placeholder-gray-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition"
|
||||||
|
formControlName="password_confirmation"
|
||||||
|
id="password_confirmation"
|
||||||
|
placeholder="Confirm your password"
|
||||||
|
type="password"
|
||||||
|
/>
|
||||||
|
@if (hasFieldError('password_confirmation')) {
|
||||||
|
<p class="mt-1 text-xs text-red-600">{{ getFieldError('password_confirmation') }}</p>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Submit button -->
|
||||||
|
<button
|
||||||
|
[disabled]="loading"
|
||||||
|
class="w-full flex justify-center items-center gap-2 rounded-lg bg-indigo-600 hover:bg-indigo-700 disabled:bg-indigo-300 disabled:cursor-not-allowed text-white font-semibold py-3 transition"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
@if (loading) {
|
||||||
|
<svg class="animate-spin h-5 w-5 text-white" fill="none" viewBox="0 0 24 24"
|
||||||
|
xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4"></circle>
|
||||||
|
<path class="opacity-75" d="M4 12a8 8 0 018-8v8H4z" fill="currentColor"></path>
|
||||||
|
</svg>
|
||||||
|
<span>Registering...</span>
|
||||||
|
} @else {
|
||||||
|
<span>Sign Up</span>
|
||||||
|
}
|
||||||
|
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<!-- Footer -->
|
||||||
|
<div class="mt-6 text-center text-sm text-gray-600">
|
||||||
|
Already have an account?
|
||||||
|
<button (click)="goToLogin()" class="font-semibold text-indigo-600 hover:text-indigo-700 focus:outline-none"
|
||||||
|
type="button">
|
||||||
|
Log in here
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
23
src/app/components/register/register.component.spec.ts
Normal file
23
src/app/components/register/register.component.spec.ts
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { RegisterComponent } from './register.component';
|
||||||
|
|
||||||
|
describe('Register', () => {
|
||||||
|
let component: RegisterComponent;
|
||||||
|
let fixture: ComponentFixture<RegisterComponent>;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
await TestBed.configureTestingModule({
|
||||||
|
imports: [RegisterComponent]
|
||||||
|
})
|
||||||
|
.compileComponents();
|
||||||
|
|
||||||
|
fixture = TestBed.createComponent(RegisterComponent);
|
||||||
|
component = fixture.componentInstance;
|
||||||
|
fixture.detectChanges();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should create', () => {
|
||||||
|
expect(component).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
167
src/app/components/register/register.component.ts
Normal file
167
src/app/components/register/register.component.ts
Normal file
@ -0,0 +1,167 @@
|
|||||||
|
import {Component, OnInit, OnDestroy} from '@angular/core';
|
||||||
|
import {
|
||||||
|
FormBuilder,
|
||||||
|
FormGroup,
|
||||||
|
Validators,
|
||||||
|
AbstractControl,
|
||||||
|
ValidationErrors,
|
||||||
|
ReactiveFormsModule
|
||||||
|
} from '@angular/forms';
|
||||||
|
import {Router, ActivatedRoute} from '@angular/router';
|
||||||
|
import {Subject} from 'rxjs';
|
||||||
|
import {takeUntil} from 'rxjs/operators';
|
||||||
|
import {ApiResponse, ApiService, AuthResponse, RegisterData} from '../../services/api';
|
||||||
|
import {NgClass} from '@angular/common';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-register',
|
||||||
|
templateUrl: './register.component.html',
|
||||||
|
imports: [
|
||||||
|
ReactiveFormsModule,
|
||||||
|
NgClass
|
||||||
|
],
|
||||||
|
styleUrls: ['./register.component.css']
|
||||||
|
})
|
||||||
|
export class RegisterComponent implements OnInit, OnDestroy {
|
||||||
|
registerForm: FormGroup;
|
||||||
|
loading = false;
|
||||||
|
error = '';
|
||||||
|
success = '';
|
||||||
|
private destroy$ = new Subject<void>();
|
||||||
|
returnUrl = '';
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private fb: FormBuilder,
|
||||||
|
private apiService: ApiService,
|
||||||
|
private router: Router,
|
||||||
|
private route: ActivatedRoute
|
||||||
|
) {
|
||||||
|
this.registerForm = this.fb.group({
|
||||||
|
name: ['', [Validators.required, Validators.minLength(3)]],
|
||||||
|
email: ['', [Validators.required, Validators.email]],
|
||||||
|
password: ['', [Validators.required, Validators.minLength(6)]],
|
||||||
|
password_confirmation: ['', [Validators.required]]
|
||||||
|
}, {validators: this.passwordsMatchValidator});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/dashboard';
|
||||||
|
this.clearMessages();
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.destroy$.next();
|
||||||
|
this.destroy$.complete();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Custom validator to check password and confirmation match
|
||||||
|
passwordsMatchValidator(group: AbstractControl): ValidationErrors | null {
|
||||||
|
const password = group.get('password')?.value;
|
||||||
|
const confirm = group.get('password_confirmation')?.value;
|
||||||
|
return password === confirm ? null : {passwordsMismatch: true};
|
||||||
|
}
|
||||||
|
|
||||||
|
get f() {
|
||||||
|
return this.registerForm.controls;
|
||||||
|
}
|
||||||
|
|
||||||
|
getFieldError(fieldName: string): string {
|
||||||
|
const field = this.registerForm.get(fieldName);
|
||||||
|
if (!field) return '';
|
||||||
|
|
||||||
|
if (field.errors && (field.touched || field.dirty)) {
|
||||||
|
if (field.errors['required']) {
|
||||||
|
return `${this.capitalizeFirst(fieldName.replace('_', ' '))} is required`;
|
||||||
|
}
|
||||||
|
if (field.errors['email']) {
|
||||||
|
return 'Please enter a valid email address';
|
||||||
|
}
|
||||||
|
if (field.errors['minlength']) {
|
||||||
|
return `${this.capitalizeFirst(fieldName.replace('_', ' '))} must be at least ${field.errors['minlength'].requiredLength} characters`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (fieldName === 'password_confirmation' && this.registerForm.errors?.["passwordsMismatch"] && (field.touched || field.dirty)) {
|
||||||
|
return 'Passwords do not match';
|
||||||
|
}
|
||||||
|
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
hasFieldError(fieldName: string): boolean {
|
||||||
|
const field = this.registerForm.get(fieldName);
|
||||||
|
if (!field) return false;
|
||||||
|
|
||||||
|
if (fieldName === 'password_confirmation') {
|
||||||
|
return field.touched && this.registerForm.errors?.["passwordsMismatch"] === true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return !!(field.errors && (field.touched || field.dirty));
|
||||||
|
}
|
||||||
|
|
||||||
|
private capitalizeFirst(str: string): string {
|
||||||
|
return str.charAt(0).toUpperCase() + str.slice(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
clearMessages(): void {
|
||||||
|
this.error = '';
|
||||||
|
this.success = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
onSubmit(): void {
|
||||||
|
this.clearMessages();
|
||||||
|
this.registerForm.markAllAsTouched();
|
||||||
|
|
||||||
|
if (this.registerForm.invalid) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.loading = true;
|
||||||
|
|
||||||
|
const userData: RegisterData = {
|
||||||
|
name: this.f['name'].value,
|
||||||
|
email: this.f['email'].value,
|
||||||
|
password: this.f['password'].value,
|
||||||
|
password_confirmation: this.f['password_confirmation'].value
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
this.apiService.register(userData)
|
||||||
|
.pipe(takeUntil(this.destroy$))
|
||||||
|
.subscribe({
|
||||||
|
next: (response: ApiResponse<AuthResponse>) => {
|
||||||
|
this.loading = false;
|
||||||
|
if (response.success) {
|
||||||
|
this.success = 'Registration successful! Redirecting...';
|
||||||
|
setTimeout(() => {
|
||||||
|
this.router.navigate([this.returnUrl]);
|
||||||
|
}, 1000);
|
||||||
|
} else {
|
||||||
|
this.error = response.message || 'Registration failed. Please try again.';
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: (error: { status: number; error: { errors: any; }; userMessage: string; }) => {
|
||||||
|
this.loading = false;
|
||||||
|
if (error.status === 422 && error.error?.errors) {
|
||||||
|
const serverErrors = error.error.errors;
|
||||||
|
let errorMessages: string[] = [];
|
||||||
|
|
||||||
|
Object.keys(serverErrors).forEach(key => {
|
||||||
|
if (Array.isArray(serverErrors[key])) {
|
||||||
|
errorMessages = errorMessages.concat(serverErrors[key]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
this.error = errorMessages.join(', ');
|
||||||
|
} else {
|
||||||
|
this.error = error.userMessage || 'An error occurred. Please try again.';
|
||||||
|
}
|
||||||
|
console.error('Registration error:', error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
goToLogin(): void {
|
||||||
|
this.router.navigate(['/login'], {queryParams: {returnUrl: this.returnUrl}});
|
||||||
|
}
|
||||||
|
}
|
||||||
16
src/app/services/api.spec.ts
Normal file
16
src/app/services/api.spec.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TestBed } from '@angular/core/testing';
|
||||||
|
|
||||||
|
import { Api } from './api';
|
||||||
|
|
||||||
|
describe('Api', () => {
|
||||||
|
let service: Api;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
TestBed.configureTestingModule({});
|
||||||
|
service = TestBed.inject(Api);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should be created', () => {
|
||||||
|
expect(service).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
208
src/app/services/api.ts
Normal file
208
src/app/services/api.ts
Normal file
@ -0,0 +1,208 @@
|
|||||||
|
import { Injectable } from '@angular/core';
|
||||||
|
import { HttpClient, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
|
||||||
|
import { Observable, throwError, BehaviorSubject } from 'rxjs';
|
||||||
|
import { catchError, tap } from 'rxjs/operators';
|
||||||
|
import { environment as env } from '../../environments/environment' ;
|
||||||
|
|
||||||
|
export interface LoginCredentials {
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface RegisterData {
|
||||||
|
name: string;
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
password_confirmation: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ApiResponse<T = any> {
|
||||||
|
success: boolean;
|
||||||
|
data?: T;
|
||||||
|
message?: string;
|
||||||
|
errors?: any;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface AuthResponse {
|
||||||
|
user: any;
|
||||||
|
token: string;
|
||||||
|
expires_in?: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable({
|
||||||
|
providedIn: 'root'
|
||||||
|
})
|
||||||
|
export class ApiService {
|
||||||
|
private baseUrl = env.apiUrl || 'http://localhost:8000/api';
|
||||||
|
private tokenSubject = new BehaviorSubject<string | null>(this.getStoredToken());
|
||||||
|
public token$ = this.tokenSubject.asObservable();
|
||||||
|
|
||||||
|
constructor(private http: HttpClient) {}
|
||||||
|
|
||||||
|
// Get stored token from localStorage
|
||||||
|
private getStoredToken(): string | null {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
return localStorage.getItem('auth_token');
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set token in localStorage and update subject
|
||||||
|
private setToken(token: string): void {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
localStorage.setItem('auth_token', token);
|
||||||
|
}
|
||||||
|
this.tokenSubject.next(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove token from localStorage and update subject
|
||||||
|
private removeToken(): void {
|
||||||
|
if (typeof window !== 'undefined') {
|
||||||
|
localStorage.removeItem('auth_token');
|
||||||
|
}
|
||||||
|
this.tokenSubject.next(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get current token value
|
||||||
|
get currentToken(): string | null {
|
||||||
|
return this.tokenSubject.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if user is authenticated
|
||||||
|
get isAuthenticated(): boolean {
|
||||||
|
return !!this.currentToken;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get HTTP headers with auth token
|
||||||
|
private getHeaders(): HttpHeaders {
|
||||||
|
let headers = new HttpHeaders({
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Accept': 'application/json'
|
||||||
|
});
|
||||||
|
|
||||||
|
const token = this.currentToken;
|
||||||
|
if (token) {
|
||||||
|
headers = headers.set('Authorization', `Bearer ${token}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return headers;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle HTTP errors
|
||||||
|
private handleError(error: HttpErrorResponse): Observable<never> {
|
||||||
|
let errorMessage = 'An unknown error occurred';
|
||||||
|
|
||||||
|
if (error.error instanceof ErrorEvent) {
|
||||||
|
// Client-side error
|
||||||
|
errorMessage = error.error.message;
|
||||||
|
} else {
|
||||||
|
// Server-side error
|
||||||
|
if (error.status === 401) {
|
||||||
|
this.removeToken();
|
||||||
|
errorMessage = 'Unauthorized. Please login again.';
|
||||||
|
} else if (error.status === 422) {
|
||||||
|
errorMessage = 'Validation error';
|
||||||
|
} else if (error.error?.message) {
|
||||||
|
errorMessage = error.error.message;
|
||||||
|
} else {
|
||||||
|
errorMessage = `Error Code: ${error.status}\nMessage: ${error.message}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
console.error('API Error:', error);
|
||||||
|
return throwError(() => ({ ...error, userMessage: errorMessage }));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generic HTTP methods
|
||||||
|
private get<T>(endpoint: string): Observable<T> {
|
||||||
|
return this.http.get<T>(`${this.baseUrl}${endpoint}`, {
|
||||||
|
headers: this.getHeaders()
|
||||||
|
}).pipe(
|
||||||
|
catchError(this.handleError.bind(this))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private post<T>(endpoint: string, data: any): Observable<T> {
|
||||||
|
return this.http.post<T>(`${this.baseUrl}${endpoint}`, data, {
|
||||||
|
headers: this.getHeaders()
|
||||||
|
}).pipe(
|
||||||
|
catchError(this.handleError.bind(this))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private put<T>(endpoint: string, data: any): Observable<T> {
|
||||||
|
return this.http.put<T>(`${this.baseUrl}${endpoint}`, data, {
|
||||||
|
headers: this.getHeaders()
|
||||||
|
}).pipe(
|
||||||
|
catchError(this.handleError.bind(this))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private delete<T>(endpoint: string): Observable<T> {
|
||||||
|
return this.http.delete<T>(`${this.baseUrl}${endpoint}`, {
|
||||||
|
headers: this.getHeaders()
|
||||||
|
}).pipe(
|
||||||
|
catchError(this.handleError.bind(this))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Authentication methods
|
||||||
|
register(userData: RegisterData): Observable<ApiResponse<AuthResponse>> {
|
||||||
|
return this.post<ApiResponse<AuthResponse>>('/auth/register', userData).pipe(
|
||||||
|
tap(response => {
|
||||||
|
if (response.success && response.data?.token) {
|
||||||
|
this.setToken(response.data.token);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
login(credentials: LoginCredentials): Observable<ApiResponse<AuthResponse>> {
|
||||||
|
return this.post<ApiResponse<AuthResponse>>('/auth/login', credentials).pipe(
|
||||||
|
tap(response => {
|
||||||
|
if (response.success && response.data?.token) {
|
||||||
|
this.setToken(response.data.token);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
logout(): Observable<ApiResponse> {
|
||||||
|
return this.post<ApiResponse>('/auth/logout', {}).pipe(
|
||||||
|
tap(() => {
|
||||||
|
this.removeToken();
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
getCurrentUser(): Observable<ApiResponse> {
|
||||||
|
return this.get<ApiResponse>('/auth/user');
|
||||||
|
}
|
||||||
|
|
||||||
|
refreshToken(): Observable<ApiResponse<AuthResponse>> {
|
||||||
|
return this.post<ApiResponse<AuthResponse>>('/auth/refresh', {}).pipe(
|
||||||
|
tap(response => {
|
||||||
|
if (response.success && response.data?.token) {
|
||||||
|
this.setToken(response.data.token);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Generic API methods for future use
|
||||||
|
getData<T>(endpoint: string): Observable<T> {
|
||||||
|
return this.get<T>(endpoint);
|
||||||
|
}
|
||||||
|
|
||||||
|
postData<T>(endpoint: string, data: any): Observable<T> {
|
||||||
|
return this.post<T>(endpoint, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
putData<T>(endpoint: string, data: any): Observable<T> {
|
||||||
|
return this.put<T>(endpoint, data);
|
||||||
|
}
|
||||||
|
|
||||||
|
deleteData<T>(endpoint: string): Observable<T> {
|
||||||
|
return this.delete<T>(endpoint);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,4 @@
|
|||||||
|
export const environment = {
|
||||||
|
production: false,
|
||||||
|
apiUrl: 'http://localhost:8000/api'
|
||||||
|
};
|
||||||
18
src/main.ts
18
src/main.ts
@ -1,6 +1,16 @@
|
|||||||
import { bootstrapApplication } from '@angular/platform-browser';
|
import { bootstrapApplication } from '@angular/platform-browser';
|
||||||
import { appConfig } from './app/app.config';
|
import { provideRouter } from '@angular/router';
|
||||||
import { App } from './app/app';
|
import { provideHttpClient } from '@angular/common/http';
|
||||||
|
import { importProvidersFrom } from '@angular/core';
|
||||||
|
import { ReactiveFormsModule } from '@angular/forms';
|
||||||
|
|
||||||
bootstrapApplication(App, appConfig)
|
import { App } from './app/app';
|
||||||
.catch((err) => console.error(err));
|
import { routes } from './app/app.routes';
|
||||||
|
|
||||||
|
bootstrapApplication(App, {
|
||||||
|
providers: [
|
||||||
|
provideRouter(routes),
|
||||||
|
provideHttpClient(),
|
||||||
|
importProvidersFrom(ReactiveFormsModule)
|
||||||
|
]
|
||||||
|
}).catch(err => console.error(err));
|
||||||
|
|||||||
@ -1 +1,2 @@
|
|||||||
|
@import "tailwindcss";
|
||||||
/* You can add global styles to this file, and also import other style files */
|
/* You can add global styles to this file, and also import other style files */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user