updated app.tsx, main.tsx, and their css files, and updated github wo…

…rkflows to act based on the new changes in the repo layout
moheladwy · Dec 30, 2024 · 5622ada · 5622ada
1 parent b2f7d89
commit 5622ada
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 186 deletions.
diff --git a/.github/workflows/docker-deploy.yml b/.github/workflows/docker-deploy.yml
@@ -1,38 +1,38 @@
 name: Docker Image Deploy
 
 on:
-  push:
-    branches: ["main"]
+    push:
+        branches: ["main"]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout the code
-        uses: actions/checkout@v4
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Set date tag
-        run: echo "DATE_TAG=$(date +%s)" >> $GITHUB_ENV
-
-      - name: Build the Docker image
-        run: |
-          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} .
-
-      - name: Tag the Docker image
-        run: |
-          # Tag with timestamp
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }}
-          # Tag as latest
-          docker tag ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:latest
-
-      - name: Push the Docker image
-        run: |
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }}
-          docker push ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:latest
+    build:
+        runs-on: ubuntu-latest
+
+        steps:
+            - name: Checkout the code
+              uses: actions/checkout@v4
+
+            - name: Login to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  username: ${{ secrets.DOCKERHUB_USERNAME }}
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+            - name: Set date tag
+              run: echo "DATE_TAG=$(date +%s)" >> $GITHUB_ENV
+
+            - name: Build the Docker image
+              run: |
+                  docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} server
+
+            - name: Tag the Docker image
+              run: |
+                  # Tag with timestamp
+                  docker tag ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }}
+                  # Tag as latest
+                  docker tag ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }} ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:latest
+
+            - name: Push the Docker image
+              run: |
+                  docker push ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:${{ env.DATE_TAG }}
+                  docker push ${{ secrets.DOCKERHUB_USERNAME }}/todo-api:latest
diff --git a/.github/workflows/dotnet-lint.yml b/.github/workflows/dotnet-lint.yml
@@ -21,9 +21,12 @@ jobs:
 
             - name: Restore dependencies
               run: dotnet restore
+              working-directory: server
 
             - name: Build
               run: dotnet build --no-restore
+              working-directory: server
 
             - name: Test
               run: dotnet test --no-build --verbosity normal
+              working-directory: server
diff --git a/client/src/App.css b/client/src/App.css
@@ -1,42 +0,0 @@
-#root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
-}
-
-.card {
-  padding: 2em;
-}
-
-.read-the-docs {
-  color: #888;
-}

diff --git a/client/src/App.tsx b/client/src/App.tsx
@@ -1,35 +1,10 @@
-import { useState } from 'react'
-import reactLogo from './assets/react.svg'
-import viteLogo from '/vite.svg'
-import './App.css'
+import "./App.css";
 
-function App() {
-  const [count, setCount] = useState(0)
-
-  return (
-    <>
-      <div>
-        <a href="https://vite.dev" target="_blank">
-          <img src={viteLogo} className="logo" alt="Vite logo" />
-        </a>
-        <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo" />
-        </a>
-      </div>
-      <h1>Vite + React</h1>
-      <div className="card">
-        <button onClick={() => setCount((count) => count + 1)}>
-          count is {count}
-        </button>
-        <p>
-          Edit <code>src/App.tsx</code> and save to test HMR
-        </p>
-      </div>
-      <p className="read-the-docs">
-        Click on the Vite and React logos to learn more
-      </p>
-    </>
-  )
+export default function App() {
+	return (
+		<h1>
+			Todo Application using ReactJS with TS for the Frontend and ASP.NET
+			Core 8 Web API for the backend
+		</h1>
+	);
 }
-
-export default App
diff --git a/client/src/assets/react.svg b/client/src/assets/react.svg
diff --git a/client/src/index.css b/client/src/index.css
@@ -1,68 +0,0 @@
-:root {
-  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-a:hover {
-  color: #535bf2;
-}
-
-body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-button:hover {
-  border-color: #646cff;
-}
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
-}

diff --git a/client/src/main.tsx b/client/src/main.tsx
@@ -1,10 +1,10 @@
-import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import './index.css'
-import App from './App.tsx'
+import { StrictMode } from "react";
+import { createRoot } from "react-dom/client";
+import "./index.css";
+import App from "./App.tsx";
 
-createRoot(document.getElementById('root')!).render(
-  <StrictMode>
-    <App />
-  </StrictMode>,
-)
+createRoot(document.getElementById("root")!).render(
+	<StrictMode>
+		<App />
+	</StrictMode>
+);