Skip to content

Commit

Permalink
Merge pull request #180 from rkozyak/RichardK
Browse files Browse the repository at this point in the history
Changed Project Name
  • Loading branch information
rkozyak authored Sep 16, 2024
2 parents ac3a9af + b5cbd2c commit e4cfdf4
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion Website/astro.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import tailwind from '@astrojs/tailwind'
// https://astro.build/config
export default defineConfig({
site: 'https://rkozyak.github.io/',
base: '/CS2340A_Team6/',
base: '/HealthTrack/',
integrations: [
react(),
tailwind({
Expand Down
26 changes: 13 additions & 13 deletions Website/src/components/Header.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,33 +7,33 @@ import ThemeToggle from '@/components/ThemeToggle.astro'
<div class="container flex h-16 items-center justify-between space-x-4">
<!-- Logo and Home Link -->
<div class="flex gap-6 md:gap-10 items-center">
<a href="/CS2340A_Team6/" class="flex items-center space-x-2">
<a href="/HealthTrack/" class="flex items-center space-x-2">
<span class="inline-block font-bold">HealthTrack</span>
</a>
</div>
<!-- Centered Navigation Links on Desktop -->
<nav class="hidden md:flex flex-1 items-center justify-center space-x-4">
<a href="/CS2340A_Team6/design" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/design" class={buttonVariants({ variant: 'ghost' })}>
Design & Architecture
</a>
<a href="/CS2340A_Team6/ui" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/ui" class={buttonVariants({ variant: 'ghost' })}>
User Interface
</a>
<a href="/CS2340A_Team6/functionality" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/functionality" class={buttonVariants({ variant: 'ghost' })}>
Functionality
</a>
<a href="/CS2340A_Team6/conclusions" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/conclusions" class={buttonVariants({ variant: 'ghost' })}>
Conclusions
</a>
<a href="/CS2340A_Team6/contributors" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/contributors" class={buttonVariants({ variant: 'ghost' })}>
Contributors
</a>
</nav>
<!-- Light/Dark Mode Toggle and Menu Toggle -->
<div class="flex items-center space-x-4 md:ml-auto">
<nav class="hidden md:flex items-center space-x-1">
<a
href="https://github.com/rkozyak/CS2340A_Team6"
href="https://github.com/rkozyak/HealthTrack"
target="_blank"
rel="noreferrer"
class={buttonVariants({ variant: 'ghost' })}
Expand All @@ -50,23 +50,23 @@ import ThemeToggle from '@/components/ThemeToggle.astro'
<!-- Side menu for mobile -->
<nav id="mobile-menu" class="fixed inset-y-0 left-0 w-full bg-background transform -translate-x-full transition-transform md:hidden z-50">
<div class="flex flex-col p-4 space-y-4">
<a href="/CS2340A_Team6/design" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/design" class={buttonVariants({ variant: 'ghost' })}>
Design & Architecture
</a>
<a href="/CS2340A_Team6/ui" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/ui" class={buttonVariants({ variant: 'ghost' })}>
User Interface
</a>
<a href="/CS2340A_Team6/functionality" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/functionality" class={buttonVariants({ variant: 'ghost' })}>
Functionality
</a>
<a href="/CS2340A_Team6/conclusions" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/conclusions" class={buttonVariants({ variant: 'ghost' })}>
Conclusions
</a>
<a href="/CS2340A_Team6/contributors" class={buttonVariants({ variant: 'ghost' })}>
<a href="/HealthTrack/contributors" class={buttonVariants({ variant: 'ghost' })}>
Contributors
</a>
<a
href="https://github.com/rkozyak/CS2340A_Team6"
href="https://github.com/rkozyak/HealthTrack"
target="_blank"
rel="noreferrer"
class={buttonVariants({ variant: 'ghost' })}
Expand Down
2 changes: 1 addition & 1 deletion Website/src/pages/404.astro
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ import { buttonVariants } from '@/components/ui/button'
<p class="mb-4 leading-7 [&:not(:first-child)]:mt-6">
Sorry, we couldn't find the page you're looking for.
</p>
<a href="/CS2340A_Team6/" rel="noreferrer" class={buttonVariants()}> Go back home</a>
<a href="/HealthTrack/" rel="noreferrer" class={buttonVariants()}> Go back home</a>
</div>
</BaseLayout>
4 changes: 2 additions & 2 deletions Website/src/pages/contributors.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import BaseLayout from '@/layouts/BaseLayout.astro'
import { buttonVariants } from '@/components/ui/button'
import '@fortawesome/fontawesome-free/css/all.min.css';
const basePath = '/CS2340A_Team6/';
const basePath = '/HealthTrack/';
// Define team members with their details
const teamMembers = [
Expand Down Expand Up @@ -56,7 +56,7 @@ const teamMembers = [
))}
</div>
<div class="mt-8 text-center mb-8">
<a href="/CS2340A_Team6/" rel="noreferrer" class={buttonVariants()}>Go back home</a>
<a href="/HealthTrack/" rel="noreferrer" class={buttonVariants()}>Go back home</a>
</div>
</div>
</BaseLayout>
8 changes: 4 additions & 4 deletions Website/src/pages/design.astro
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import BaseLayout from '@/layouts/BaseLayout.astro';
On top of that, our group also added Strategy Design later on in our development phase in order to abstract the sorting process and allow for the addition of more possible sorting methods using the strategy design pattern. With it, our application now has a refresh sorting strategy and name sorting strategy that allows for a cleaner code and easier update.
</p>

<img src="/CS2340A_Team6/sd.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">
<img src="/HealthTrack/sd.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">

<img src="/CS2340A_Team6/dcd.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">
<img src="/HealthTrack/dcd.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">

<img src="/CS2340A_Team6/code1.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">
<img src="/HealthTrack/code1.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">

<img src="/CS2340A_Team6/code2.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">
<img src="/HealthTrack/code2.jpeg" alt="HealthTrack" class="object-cover rounded-lg shadow-lg mb-4">
</div>
</div>
</BaseLayout>
2 changes: 1 addition & 1 deletion Website/src/pages/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { buttonVariants } from '@/components/ui/button'

<!-- Image Section -->
<div class="flex-shrink-0 w-full md:w-1/3">
<img src="/CS2340A_Team6/launchPage.png" alt="HealthTrack" class="w-full max-h-[800px] object-cover rounded-lg shadow-lg">
<img src="/HealthTrack/launchPage.png" alt="HealthTrack" class="w-full max-h-[800px] object-cover rounded-lg shadow-lg">
</div>
</div>

Expand Down
16 changes: 8 additions & 8 deletions Website/src/pages/ui.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import BaseLayout from '@/layouts/BaseLayout.astro';
const screenshots = [
{ src: '/CS2340A_Team6/launchPage.png', alt: 'Launch Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/loginPage.png', alt: 'Sign In Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/homePage.png', alt: 'Home Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/accountInfo.png', alt: 'Account Info Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/caloriesPage.png', alt: 'Calories Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/workoutTrackerPage.png', alt: 'Tracker Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/workoutPlansPage.png', alt: 'Workout Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/CS2340A_Team6/communityPage.png', alt: 'Community Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/launchPage.png', alt: 'Launch Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/loginPage.png', alt: 'Sign In Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/homePage.png', alt: 'Home Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/accountInfo.png', alt: 'Account Info Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/caloriesPage.png', alt: 'Calories Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/workoutTrackerPage.png', alt: 'Tracker Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/workoutPlansPage.png', alt: 'Workout Screen', description: 'This is text describing what is seen on the picture above.' },
{ src: '/HealthTrack/communityPage.png', alt: 'Community Screen', description: 'This is text describing what is seen on the picture above.' },
// Add more screenshots if needed
];
---
Expand Down

0 comments on commit e4cfdf4

Please sign in to comment.