+
@@ -71,17 +71,17 @@ onMounted(async () => {
-->
-
-
-
+
+
-
-
+
- -
+
diff --git a/app/src/views/LandingPage.vue b/app/src/views/LandingPage.vue
new file mode 100644
index 0000000..8db69bb
--- /dev/null
+++ b/app/src/views/LandingPage.vue
@@ -0,0 +1,299 @@
+
+
+ (
},
tasks: [taskSchema],
hints: [[String]],
+ responses: {
+ type: [[responseSchema]],
+ required: true,
+ default: [],
+ },
graph: {
type: nodeSchema,
default: {
diff --git a/server/src/api/controllers/authController.ts b/server/src/api/controllers/authController.ts
index a86f0fb..258ba4f 100644
--- a/server/src/api/controllers/authController.ts
+++ b/server/src/api/controllers/authController.ts
@@ -67,7 +67,7 @@ export function socialLoginHandler(req: Request, res: Response) {
res.redirect('/choose-username')
return
}
- res.redirect('/')
+ res.redirect('/map')
}
export const registerFromSession = asyncHandler(
diff --git a/server/src/api/controllers/commandController.ts b/server/src/api/controllers/commandController.ts
index 5e4f5f2..4306601 100644
--- a/server/src/api/controllers/commandController.ts
+++ b/server/src/api/controllers/commandController.ts
@@ -6,8 +6,6 @@ import { pushToSession } from '../socket.js'
import { finishSession } from '../../models/sessionManager.js'
import { asyncHandler } from '../../middleware/error.js'
-const commandCompleteCallbacks = new Map()
-
export const newCommand = asyncHandler(async (req: Request, res: Response) => {
const { command, pwd, output, error, params } = matchedData(req)
@@ -51,42 +49,14 @@ export const newCommand = asyncHandler(async (req: Request, res: Response) => {
c.stage = response.stage
await c.save()
- if (response.stage === 'END') {
+ session.responses.push(response.responses)
+
+ if ((session.status as string) === 'finished') {
await finishSession(session)
}
- commandCompleteCallbacks.set(session.id, response.callback)
- pushToSession(session.id, 'status', 'pending')
- res.status(201).json(response)
- } else {
- res.status(200).end()
+ pushToSession(session.id, 'response', response)
}
+ res.status(200).end()
await session.save()
})
-
-export const completedCommand = asyncHandler(
- async (req: Request, res: Response) => {
- const { sessionId } = req.user as any
-
- const session = await Session.findById(sessionId)
-
- if (!session) {
- res.status(404).json({ message: 'session not found' })
- return
- }
-
- if (session.status === 'inactive') {
- res.status(400).json({ message: 'session is not active' })
- return
- }
-
- const callback = commandCompleteCallbacks.get(session.id)
- if (!callback) {
- res.status(200).json({ message: 'no callback found' })
- return
- }
- callback()
- commandCompleteCallbacks.delete(session.id)
- res.json({ message: 'ok' })
- }
-)
diff --git a/server/src/api/controllers/sessionController.ts b/server/src/api/controllers/sessionController.ts
index 2fb6f00..6c4f348 100644
--- a/server/src/api/controllers/sessionController.ts
+++ b/server/src/api/controllers/sessionController.ts
@@ -25,6 +25,7 @@ function sessionDetail(session: ISession) {
...sessionSummary(session),
hints: session.hints,
tasks: session.tasks,
+ responses: session.responses,
graph: session.graph,
}
}
@@ -55,6 +56,7 @@ export const createSession = asyncHandler(
export const getSessionById = asyncHandler(
async (req: Request, res: Response) => {
const { sessionId } = matchedData(req)
+ console.log(sessionId)
const session = await Session.findOne({
_id: sessionId,
user: (req.user as Express.ExistingUser).id,
diff --git a/server/src/api/routes/commandRouter.ts b/server/src/api/routes/commandRouter.ts
index ef22842..b255d21 100644
--- a/server/src/api/routes/commandRouter.ts
+++ b/server/src/api/routes/commandRouter.ts
@@ -5,6 +5,5 @@ import { newCommandValidator } from '../validators/commandValidator.js'
const router = Router()
router.post('/', newCommandValidator, commandController.newCommand)
-router.post('/completed', commandController.completedCommand)
export default router
diff --git a/server/src/api/routes/sessionRouter.ts b/server/src/api/routes/sessionRouter.ts
index ddc7cdb..52e4e0c 100644
--- a/server/src/api/routes/sessionRouter.ts
+++ b/server/src/api/routes/sessionRouter.ts
@@ -22,6 +22,10 @@ router.post(
activeSessionValidator,
sessionController.getOrCreateSession
)
-router.get('/:id', sessionDetailValidator, sessionController.getSessionById)
+router.get(
+ '/:sessionId',
+ sessionDetailValidator,
+ sessionController.getSessionById
+)
export default router
diff --git a/server/src/api/validators/sessionValidator.ts b/server/src/api/validators/sessionValidator.ts
index ddb3c84..558b5b6 100644
--- a/server/src/api/validators/sessionValidator.ts
+++ b/server/src/api/validators/sessionValidator.ts
@@ -9,6 +9,6 @@ export const checkSessionId = () =>
check('sessionId').notEmpty().isString().isMongoId()
export const sessionListValidator = [checkQuestId(), checkSessionStatus()]
-export const sessionDetailValidator = [checkSessionId(), noError]
+export const sessionDetailValidator = [checkSessionId()]
export const createSessionValidator = [checkQuestId(), noError]
export const activeSessionValidator = [checkQuestId(), noError]
diff --git a/server/src/game/sessionHandler.ts b/server/src/game/sessionHandler.ts
index 6808f5c..c061d57 100644
--- a/server/src/game/sessionHandler.ts
+++ b/server/src/game/sessionHandler.ts
@@ -8,12 +8,12 @@ import type {
IStage,
ITask,
} from '@linux-odyssey/models'
-import { pushToSession } from '../api/socket.js'
export interface ExecuteResult {
responses: IResponse[]
hints: string[]
- callback: () => void
+ tasks?: ITask[]
+ status: string
stage?: string
end?: boolean
}
@@ -79,15 +79,17 @@ export default class SessionHandler {
this.addNewTasks()
+ this.session.responses.push(stage.responses)
+
+ if (stage.id === 'END') {
+ this.session.status = 'finished'
+ }
+
return {
responses: stage.responses,
hints: stage.hints,
- callback: () => {
- pushToSession(this.session.id, 'tasks', this.session.tasks)
- if (stage.hints && stage.hints.length > 0)
- pushToSession(this.session.id, 'hints', stage.hints)
- pushToSession(this.session.id, 'status', this.session.status)
- },
+ tasks: this.session.tasks,
+ status: this.session.status,
}
}
@@ -98,11 +100,7 @@ export default class SessionHandler {
return {
responses,
hints,
- callback: () => {
- if (hints && hints.length > 0)
- pushToSession(this.session.id, 'hints', hints)
- pushToSession(this.session.id, 'status', this.session.status)
- },
+ status: this.session.status,
}
}
}
diff --git a/tests/cypress/e2e/UItests.cy.ts b/tests/cypress/e2e/UItests.cy.ts
index 1ea8646..031e104 100644
--- a/tests/cypress/e2e/UItests.cy.ts
+++ b/tests/cypress/e2e/UItests.cy.ts
@@ -75,7 +75,7 @@ describe('example helloworld app', () => {
describe('Game Start Page UI', () => {
const title = '終端機的基本知識'
beforeEach(() => {
- cy.PrepareForGame()
+ cy.PrepareForGame('get-started')
})
it('Check Header', () => {
cy.get('#GameTitle').should('contain', 'Linux Odyssey').and('be.visible')
@@ -124,7 +124,7 @@ describe('example helloworld app', () => {
})
describe('Game Play', () => {
beforeEach(() => {
- cy.PrepareForGame()
+ cy.PrepareForGame('get-started')
})
it('Typing in Terminal', () => {
cy.typeInCommand('12345{enter}')
@@ -136,7 +136,7 @@ describe('example helloworld app', () => {
cy.checkTaskInit()
cy.InitTerminal()
cy.typeInCommand('echo start{enter}')
- cy.checkPending()
+ // cy.checkPending()
cy.waitUntilActive()
cy.get('#Lbutton').should('be.visible').and('be.disabled')
cy.get('#Rbutton').should('be.visible').and('be.disabled')
@@ -144,7 +144,7 @@ describe('example helloworld app', () => {
cy.getQuestInfo('✓ 輸入 echo start 來開始教程').should('be.visible')
cy.getQuestInfo('➤ 在終端機輸入 echo hello').should('be.visible')
cy.typeInCommand('echo hello{enter}')
- cy.checkPending()
+ // cy.checkPending()
cy.waitUntilActive()
cy.get('#Lbutton').should('be.visible').and('be.enabled')
cy.get('#Rbutton').should('be.visible').and('be.disabled')
diff --git a/tests/cypress/e2e/completeQuests.cy.ts b/tests/cypress/e2e/completeQuests.cy.ts
index 57ba8e2..dbd9de8 100644
--- a/tests/cypress/e2e/completeQuests.cy.ts
+++ b/tests/cypress/e2e/completeQuests.cy.ts
@@ -1,7 +1,4 @@
describe('Complete quests with only commands', () => {
- beforeEach(() => {
- cy.PrepareForGame()
- })
it('Complete quest : get-started', () => {
cy.CompleteStageWithCommands('get-started')
})
diff --git a/tests/cypress/support/commands.ts b/tests/cypress/support/commands.ts
index b77cd88..23d6484 100644
--- a/tests/cypress/support/commands.ts
+++ b/tests/cypress/support/commands.ts
@@ -38,7 +38,7 @@ Cypress.Commands.add('LoginWithPassword', (username, password) => {
cy.get('#password').type(password)
cy.get('#LogInOrSignUp').click()
})
-Cypress.Commands.add('PrepareForGame', () => {
+Cypress.Commands.add('PrepareForGame', (questId) => {
cy.visit('/')
// make sure the login page is loaded
cy.url().should('satisfy', (elements: string) => {
@@ -51,8 +51,9 @@ Cypress.Commands.add('PrepareForGame', () => {
)
// make sure the map page is loaded
cy.url().should('include', '/map')
- cy.visit('/game/get-started')
- cy.url().should('include', '/game/get-started')
+ const url = `/game/${questId}`
+ cy.visit(url)
+ cy.url().should('include', url)
// check task first so the terminal has better possibility loaded
cy.checkTaskInit()
cy.get('.xterm-screen', { timeout: 10000 })
@@ -114,8 +115,7 @@ Cypress.Commands.add('checkPending', () => {
)
})
Cypress.Commands.add('CompleteStageWithCommands', (stagename) => {
- cy.visit(`/game/${stagename}`)
- cy.url().should('include', `/game/${stagename}`, { timeout: 50000 })
+ cy.PrepareForGame(stagename)
cy.log(`Completing stage :${stagename}`)
cy.checkTaskInit()
cy.CheckTextElement('#reset', '重來', 'Reset').click()
@@ -123,19 +123,22 @@ Cypress.Commands.add('CompleteStageWithCommands', (stagename) => {
cy.InitTerminal()
cy.readFile(`../quests/${stagename}/answer.sh`, 'utf-8').then((answers) => {
const answerarr = answers.split('\n')
- for (const element of answerarr) {
+ answerarr.forEach((element, index) => {
cy.typeInCommand(`${element}{enter}`)
- if (answerarr.indexOf(element) + 1 !== answerarr.length) {
- cy.checkPending()
+ if (index < answerarr.length - 1) {
cy.waitUntilActive()
+ } else {
+ cy.waitUntilActive(true).then(() => {
+ cy.CheckTextElement(
+ '#QuestCompleted',
+ '關卡完成！',
+ 'Quest Completed!'
+ )
+ cy.get('div[class="modal"]').find('p').should('be.visible')
+ cy.get('#BacktoMap').should('be.visible').and('contain', '回到地圖')
+ })
}
- if (answerarr.indexOf(element) + 1 === answerarr.length) {
- cy.waitUntilActive(true)
- cy.CheckTextElement('#QuestCompleted', '關卡完成！', 'Quest Completed!')
- cy.get('div[class="modal"]').find('p').should('be.visible')
- cy.get('#BacktoMap').should('be.visible').and('contain', '回到地圖')
- }
- }
+ })
})
})
Cypress.Commands.add('CheckTextElement', (id, chText, enText) => {
+
+
diff --git a/packages/models/src/session.ts b/packages/models/src/session.ts
index fdc749f..49185fd 100644
--- a/packages/models/src/session.ts
+++ b/packages/models/src/session.ts
@@ -1,5 +1,7 @@
import { model, Schema, Types } from 'mongoose'
+import { IResponse, responseSchema } from './response.js'
+
export interface INode {
path: string
type: string
@@ -46,13 +48,14 @@ export interface ISession {
user: Types.ObjectId
quest: string
containerId: string | null
- status: string
+ status: 'active' | 'finished' | 'inactive'
createdAt: Date
updatedAt: Date
finishedAt?: Date
lastActivityAt: Date
tasks: ITask[]
hints: string[][]
+ responses: IResponse[][]
graph: INode
}
@@ -85,6 +88,11 @@ export const Session = model
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+ Sign In
+
+
+
+
+
+
+
+
+
+
+
+
+ + Linux +
+
+ + Odyssey +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + 程式設計不僅僅是寫程式碼，還涉及到如何有效地與你的電腦互動。 + 程式教育卻往往忽略背後「開發環境」的重要性， + 使得許多學生在過程中充滿挫折。 + 「開發環境」是寫程式、執行程式過程所需要的一切工具。 + 而這些工具需要在終端機輸入指令來使用。 + 大部分的程式要用來運行的環境，並非 Windows 或 Mac OS，而是 Linux + 作業系統。 Linux Odyssey 即是為此設計的線上 Linux 互動教學網站。 +
+
+ 
+
+
+ + 初學者也能立即上手 +
++ 我們明白對於初學者來說，設定和使用開發工具可能是一大障礙。 + 學習者無需安裝任何軟體，僅需通過瀏覽器即可連上一個真實的 Linux + 環境。 +
+
+ 
+
+ + 遊戲般的學習體驗 +
+
+ + Linux Odyssey 融合了遊戲的樂趣與學習的實用性。 + 透過精心設計的遊戲關卡，學習者可以一邊接受挑戰、破解謎題， + 一邊掌握 Linux 指令的運用。 +
+
+ 
+
+
+ + 真實的 Linux 操作之旅 +
++ Linux Odyssey 提供的不僅是理論知識，更是真實的操作體驗。 + 每一個指令都是在真實的 Linux 環境中執行， + 讓學習者能夠真正深入軟體開發的世界。 +
+
+ 準備好鍵盤，跟我們一起開啟你的 Linux 冒險吧！
+
+
+
+ + 團隊介紹 +
+國立臺北科技大學 智慧自動化工程科 第二屆
+
+
+ Wancat
+Neil
+A.H.
+Ray Gur
+
+
+ 大專校院資訊應用服務創新競賽
+
+
+
+ + 得獎肯定 +
+
+ 大專校院資訊應用服務創新競賽
+ 鈦坦敏捷開發特別獎 第二名
+
+ + 聯絡我們 +
+
+
+