Skip to content

Commit

Permalink
Merge branch 'dev_dev' into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
syzygy608 committed Aug 31, 2023
2 parents a62d0b7 + 7dc73f9 commit dc2b2f6
Show file tree
Hide file tree
Showing 61 changed files with 33,376 additions and 3,610 deletions.
51 changes: 27 additions & 24 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

/server

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
.env
6 changes: 3 additions & 3 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
}
{
"recommendations": ["Vue.volar", "Vue.vscode-typescript-vue-plugin"]
}
76 changes: 38 additions & 38 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
# Pineapple Schedule - A simple schedule web for CCU students

## Local development

### Prerequisites

- [Node.js](https://nodejs.org/en/) (>= 10.16.0)
- [npm](https://www.npmjs.com/) (>= 6.9.0)

### Installation

```bash
npm install
```

### Run

```bash
npm run dev
```

### Build

```bash
npm run build
```

### Preview

```bash
npm run preview
```

### Tailwind CSS Hot Reload

```bash
npm run hotfix
```
# Pineapple Schedule - A simple schedule web for CCU students

## Local development

### Prerequisites

- [Node.js](https://nodejs.org/en/) (>= 10.16.0)
- [npm](https://www.npmjs.com/) (>= 6.9.0)

### Installation

```bash
npm install
```

### Run

```bash
npm run dev
```

### Build

```bash
npm run build
```

### Preview

```bash
npm run preview
```

### Tailwind CSS Hot Reload

```bash
npm run hotfix
```
29 changes: 29 additions & 0 deletions components.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}

declare module 'vue' {
export interface GlobalComponents {
Announcement: typeof import('./src/components/pages/home/announcement.vue')['default']
ASwitch: typeof import('ant-design-vue/es')['Switch']
ClassTable: typeof import('./src/components/pages/main/classTable.vue')['default']
ColorTemplate: typeof import('./src/components/pages/main/colorTemplate.vue')['default']
Comment: typeof import('./src/components/pages/main/comment.vue')['default']
CommonOption: typeof import('./src/components/common/option/commonOption.vue')['default']
CourseCard: typeof import('./src/components/pages/main/courseCard.vue')['default']
Footer: typeof import('./src/components/layout/footer.vue')['default']
InputArea: typeof import('./src/components/pages/main/inputArea.vue')['default']
Intro: typeof import('./src/components/pages/home/intro.vue')['default']
KebabButton: typeof import('./src/components/common/optionButton/kebabButton.vue')['default']
LoadingSpinner: typeof import('./src/components/common/loadingSpinner.vue')['default']
Loginarea: typeof import('./src/components/pages/login/loginarea.vue')['default']
Navbar: typeof import('./src/components/layout/navbar.vue')['default']
Notify: typeof import('./src/components/pages/home/notify.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
Search_box: typeof import('./src/components/pages/main/search_box.vue')['default']
}
}
36 changes: 23 additions & 13 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
<!DOCTYPE html>
<html>
<head>
<meta charset = "UTF-8" />
<link rel = "icon" href = "/favicon.ico" />
<meta name = "viewport" content = "width=device-width, initial-scale=1.0" />
<title>阿梨課表 CCU Schedule</title>
</head>
<body>
<div id = "app"></div>
<script type = "module" src = "/src/main.ts"></script>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
<meta charset = "UTF-8" />
<link rel = "icon" href = "/favicon.ico" />
<meta name = "viewport" content = "width=device-width, initial-scale=1.0" />
<meta name = "description" content = "CCU Class" />
<meta name = "keywords" content = "CCU, Class" />
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src = "https://www.googletagmanager.com/gtag/js?id=G-4V5KYBRM5L"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'G-4V5KYBRM5L');
</script>
<title>CCU Class</title>
</head>
<body>
<div id = "app"></div>
<script type = "module" src = "/src/main.ts"></script>
</body>
</html>
Loading

0 comments on commit dc2b2f6

Please sign in to comment.