Skip to content

Commit

Permalink
Merge branch 'mig/index' into mgr8/about
Browse files Browse the repository at this point in the history
  • Loading branch information
EthanThatOneKid committed Sep 20, 2022
2 parents 77a2c65 + cb3e7dd commit 94e2573
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Expand Up @@ -16,6 +16,8 @@ module.exports = {
indent: ['error', 2, { SwitchCase: 1 }],
'func-style': ['error', 'declaration', { allowArrowFunctions: false }],
'prefer-arrow-callback': 'error',
'comma-dangle': 'off',
'@typescript-eslint/comma-dangle': ['error', 'only-multiline'],
'@typescript-eslint/no-unused-vars': 'error',
'@typescript-eslint/consistent-type-definitions': ['error', 'interface'],
},
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/check_website.yaml
Expand Up @@ -47,6 +47,7 @@ jobs:
run: npm run check

- name: Test
uses: microsoft/playwright-github-action@v1
run: npm run test

# info: https://etok.codes/acmcsuf.com/blob/main/CONTRIBUTING.md#npm-bloat
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -11,6 +11,7 @@
"url": "https://github.com/EthanThatOneKid/acmcsuf.com.git/"
},
"scripts": {
"start": "npm run dev",
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
Expand All @@ -23,7 +24,7 @@
"lint": "eslint . --fix",
"format": "prettier --write .",
"host": "npm run all && npm run preview",
"all": "npm run lint && npm run format && npm run check && npm t && npm run build"
"all": "npm run lint && npm run format && npm run check && npm run build && npm t"
},
"devDependencies": {
"@playwright/test": "^1.25.0",
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/nav/bar.svelte
Expand Up @@ -4,7 +4,7 @@
import Toggle from '$lib/components/toggle/toggle.svelte';
import ThemeLight from '$lib/components/svg/theme-light.svelte';
import ThemeDark from '$lib/components/svg/theme-dark.svelte';
import { AcmTheme, theme } from '$lib/legacy/theme';
import { AcmTheme, theme } from '$lib/public/legacy/theme';
let jsEnabled = false;
onMount(() => (jsEnabled = true));
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/toaster/toasts.ts
@@ -1,4 +1,4 @@
import { acmGeneral } from '$lib/legacy/acm-paths';
import { acmGeneral } from '$lib/public/legacy/acm-paths';
import { writable } from 'svelte/store';

const MAX_TOASTS = 4;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/routes/+layout.svelte
Expand Up @@ -2,7 +2,7 @@
import Navbar from '$lib/components/nav/bar.svelte';
import Footer from '$lib/components/footer/footer.svelte';
import AcmToaster from '$lib/components/toaster/toaster.svelte';
import { AcmTheme, theme } from '$lib/legacy/theme';
import { AcmTheme, theme } from '$lib/public/legacy/theme';
import { onMount } from 'svelte';
function changeTheme(event: MediaQueryListEvent) {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/+page.svelte
@@ -1,5 +1,5 @@
<script>
import Spacing from '$lib/legacy/spacing.svelte';
import Spacing from '$lib/public/legacy/spacing.svelte';
import Hero from './hero.svelte';
import WhyJoin from './why-join.svelte';
import AcmPaths from './acm-paths.svelte';
Expand Down
2 changes: 1 addition & 1 deletion src/routes/acm-paths.svelte
@@ -1,5 +1,5 @@
<script lang="ts">
import { pinnedPaths } from '$lib/legacy/acm-paths';
import { pinnedPaths } from '$lib/public/legacy/acm-paths';
</script>

<section>
Expand Down

0 comments on commit 94e2573

Please sign in to comment.