diff --git a/exercises/03_html/01_syntax/coventry.html b/exercises/03_html/01_syntax/coventry.html index ff42ccbc..a095f907 100644 --- a/exercises/03_html/01_syntax/coventry.html +++ b/exercises/03_html/01_syntax/coventry.html @@ -1,89 +1,97 @@ -History of a City: Coventry + + + + History of a City: Coventry -By Dr Charles Insley + -Copyright BBC 2005 +

History of a City: Coventry

-Join Charles Insley in Coventry for a walk through time. Although each town or city is different, they share many common themes. Discover how to read the history of your town from the buildings around you. +

By Dr Charles Insley

-Every town or city carries at least some of its past into the present. Local architecture, street names and churches all stand testimony to the passage of time. Just walking around any town - it could be your town - can become a walk into the past made visible by the buildings around you! +Copyright BBC 2005

-Of course, the history of every town or city is different but most share common aspects and themes. Many began as medieval market centres, grew during the Industrial Revolution of the late 18th & 19th centuries and have expanded and developed and expanded again since the World War Two. +Join Charles Insley in Coventry for a walk through time. Although each town or city is different, they share many common themes. Discover how to read the history of your town from the buildings around you.
-All of these changes can be seen in the towns and cities around us. If we take Coventry as an example, we can see the remains of its medieval past in St Mary's Hall, the beginnings of its industrial greatness in the working class terraces of Chapelfields, or the triumph of the motor car in the semi-detached suburbs such as Earlsdon. +Every town or city carries at least some of its past into the present. Local architecture, street names and churches all stand testimony to the passage of time. Just walking around any town - it could be your town - can become a walk into the past made visible by the buildings around you!
-Taking an even closer look at Coventry can illustrate just how much of the past can be seen when you are looking with the eyes of an historian. +Of course, the history of every town or city is different but most share common aspects and themes. Many began as medieval market centres, grew during the Industrial Revolution of the late 18th & 19th centuries and have expanded and developed and expanded again since the World War Two.
-Opening themes +All of these changes can be seen in the towns and cities around us. If we take Coventry as an example, we can see the remains of its medieval past in St Mary's Hall, the beginnings of its industrial greatness in the working class terraces of Chapelfields, or the triumph of the motor car in the semi-detached suburbs such as Earlsdon.
-The most obvious place to start is in the gutted shell of the Cathedral Church of St Michael. These Gothic ruins hint at Coventry's medieval past. -Although, like many places, very little of medieval Coventry is still standing, there is enough to give us a flavour of the bustling cloth centre that was the medieval city. +Taking an even closer look at Coventry can illustrate just how much of the past can be seen when you are looking with the eyes of an historian.
-The historical records tell us that as a settlement, Coventry may date back to the 10th century, while the building, which was to become the priory, was founded in the mid-11th century by Leofric, Earl of Mercia and his notorious wife, Godgifu, or Godiva. Many of the place-names of the villages around Coventry, places that have ultimately become its suburbs, are also Anglo-Saxon in origin. +

Opening themes

-Despite the loss of most of Coventry's surviving medieval buildings during the Blitz, the street plan of central Coventry was essentially that of the medieval city. Even now, after the complete rebuilding of the city centre, the ghost of medieval Coventry remains in some of the street names, such as Pool Meadow, Broadgate, Cross Cheaping, Earl Street, Jordan Well, Fleet Street, Spon Street and Greyfriars Green. +The most obvious place to start is in the gutted shell of the Cathedral Church of St Michael. These Gothic ruins hint at Coventry's medieval past.
+Although, like many places, very little of medieval Coventry is still standing, there is enough to give us a flavour of the bustling cloth centre that was the medieval city.
-Documentary evidence tells us that Coventry was a booming wool & cloth centre in the Middle Ages and one of the wealthiest cities in medieval England. Evidence of this wealth is hard to find, but it is there. -If we walk across the city centre from the old cathedral, we can see one of the most remarkable survivors of the destruction of 1940: the magnificent St Mary's Hall. This is one of the most impressive guildhalls surviving in England and was the seat of the city's medieval corporation, its government. Even now, this is an impressive building and tells us something about the wealth of the city in the medieval period. +The historical records tell us that as a settlement, Coventry may date back to the 10th century, while the building, which was to become the priory, was founded in the mid-11th century by Leofric, Earl of Mercia and his notorious wife, Godgifu, or Godiva. Many of the place-names of the villages around Coventry, places that have ultimately become its suburbs, are also Anglo-Saxon in origin.
-Across the 1960s pedestrian shopping precinct, and just inside the ring road, is Spon Street where with its surviving medieval shops & houses. These impressive half-timbered buildings, with their jettied upper storeys (where the first floor sticks out beyond the ground floor) give some indication of the economic standing of the city towards the end of the Middle Ages when these houses were built. Behind the 1960s shops on New Union Street we can see the remains of the once-majestic Cheylesmore manor, the Coventry palace of the Earls of Warwick. +Despite the loss of most of Coventry's surviving medieval buildings during the Blitz, the street plan of central Coventry was essentially that of the medieval city. Even now, after the complete rebuilding of the city centre, the ghost of medieval Coventry remains in some of the street names, such as Pool Meadow, Broadgate, Cross Cheaping, Earl Street, Jordan Well, Fleet Street, Spon Street and Greyfriars Green.
-Coventry differs from many other towns & cities in that there was no period of rebuilding and redevelopment in the 16th, 17th and early 18th centuries. Although the city had been a booming wool town in the Middle Ages, its economic fortunes had plummeted towards the end of the 15th century, to the extent that it was not sufficiently prosperous in the next 200 to 300 years to be substantially rebuilt or expanded. +Documentary evidence tells us that Coventry was a booming wool & cloth centre in the Middle Ages and one of the wealthiest cities in medieval England. Evidence of this wealth is hard to find, but it is there.
+If we walk across the city centre from the old cathedral, we can see one of the most remarkable survivors of the destruction of 1940: the magnificent St Mary's Hall. This is one of the most impressive guildhalls surviving in England and was the seat of the city's medieval corporation, its government. Even now, this is an impressive building and tells us something about the wealth of the city in the medieval period.
-The city walls, for instance, were not finally removed until the 18th century, although traces of this, such as Cork Street Gate, still remain. The result was that much of medieval Coventry was still standing in the first half of the 20th century, cheek by jowl with the town houses of the 18th century and the terraces of the 19th century, only to be destroyed in the disastrous air raid of November 1940. +Across the 1960s pedestrian shopping precinct, and just inside the ring road, is Spon Street where with its surviving medieval shops & houses. These impressive half-timbered buildings, with their jettied upper storeys (where the first floor sticks out beyond the ground floor) give some indication of the economic standing of the city towards the end of the Middle Ages when these houses were built. Behind the 1960s shops on New Union Street we can see the remains of the once-majestic Cheylesmore manor, the Coventry palace of the Earls of Warwick.
-The Industrial Revolution +Coventry differs from many other towns & cities in that there was no period of rebuilding and redevelopment in the 16th, 17th and early 18th centuries. Although the city had been a booming wool town in the Middle Ages, its economic fortunes had plummeted towards the end of the 15th century, to the extent that it was not sufficiently prosperous in the next 200 to 300 years to be substantially rebuilt or expanded.
-The Industrial Revolution changed the face of Britain and the period from the middle of the 18th century to the end of the 19th is one of the most interesting in urban history. -As in many other towns and cities, the Industrial Revolution has left its thumbprint on Coventry. Almost overnight, many towns and cities dramatically increased in size as people moved to the towns to take up jobs in the new industries. +The city walls, for instance, were not finally removed until the 18th century, although traces of this, such as Cork Street Gate, still remain. The result was that much of medieval Coventry was still standing in the first half of the 20th century, cheek by jowl with the town houses of the 18th century and the terraces of the 19th century, only to be destroyed in the disastrous air raid of November 1940.
-This period saw a sustained campaign of building and rebuilding in many towns and cities: working class housing for the tens of thousands of industrial labourers and improved housing for the middle classes who began to move away from the often crowded town and city centres and into the newly expanding suburbs. +

The Industrial Revolution

-Leaving the city centre, you come to parts of Coventry that were fields until well into the 18th century. Again, many towns and cities, where we can see 18th & 19th century development of areas once very rural, mirror Coventry's experience. +The Industrial Revolution changed the face of Britain and the period from the middle of the 18th century to the end of the 19th is one of the most interesting in urban history.
+As in many other towns and cities, the Industrial Revolution has left its thumbprint on Coventry. Almost overnight, many towns and cities dramatically increased in size as people moved to the towns to take up jobs in the new industries.
-Chapelfields was one of these new suburbs: its name highlights its rural origins. The houses in Chapelfields were built to house workers in the watch industry and some of these watchmakers' terraces are still standing. These are highly distinctive buildings: their large attic windows provided light for the watchmakers who used these attics as workshops. +This period saw a sustained campaign of building and rebuilding in many towns and cities: working class housing for the tens of thousands of industrial labourers and improved housing for the middle classes who began to move away from the often crowded town and city centres and into the newly expanding suburbs.
-A few streets over from Chapelfields are the narrow terraces built in Earlsdon during the 19th century for workers in Coventry's other industry, ribbon weaving and making. But Coventry's expansion in the 18th and 19th centuries was not just about the working class. +Leaving the city centre, you come to parts of Coventry that were fields until well into the 18th century. Again, many towns and cities, where we can see 18th & 19th century development of areas once very rural, mirror Coventry's experience.
-Go back into the city centre and you will find the houses built for Coventry's more prosperous 18th-century inhabitants in the fine Georgian town houses of The Quadrant and Warwick Road and the handful of surviving 18th-century houses on Little Park Street. +Chapelfields was one of these new suburbs: its name highlights its rural origins. The houses in Chapelfields were built to house workers in the watch industry and some of these watchmakers' terraces are still standing. These are highly distinctive buildings: their large attic windows provided light for the watchmakers who used these attics as workshops.
-Urban growth and industry +A few streets over from Chapelfields are the narrow terraces built in Earlsdon during the 19th century for workers in Coventry's other industry, ribbon weaving and making. But Coventry's expansion in the 18th and 19th centuries was not just about the working class.
-Like many cities and towns, much of Coventry's building environment dates from the 20th century and can be seen anywhere you choose to stand in Coventry. -In the 19th century, Earlsdon was very much a working class suburb full of terraces built for ribbon weavers and watchmakers. But by the 20th century, Earlsdon was rapidly becoming an affluent middle class suburb, with streets of detached and semi-detached houses being built during the 1920s and 1930s on what had once been open fields. +Go back into the city centre and you will find the houses built for Coventry's more prosperous 18th-century inhabitants in the fine Georgian town houses of The Quadrant and Warwick Road and the handful of surviving 18th-century houses on Little Park Street.
-As in many towns, the 20th century saw not only a massive increase in population but also the urban middle classes moving out from the town or city centre into these newly developed suburbs and commuting to work by bus, tram or even car. +

Urban growth and industry

-Coventry's car industry grew out of light engineering, especially sewing machine and bicycle manufacture. Paradoxically, it is much harder to find the physical evidence of these early, small factories than it is for earlier industry. Many of these factories were built only just outside the city centre, cheek by jowl, with terraced housing built at the same time. +Like many cities and towns, much of Coventry's building environment dates from the 20th century and can be seen anywhere you choose to stand in Coventry.
+In the 19th century, Earlsdon was very much a working class suburb full of terraces built for ribbon weavers and watchmakers. But by the 20th century, Earlsdon was rapidly becoming an affluent middle class suburb, with streets of detached and semi-detached houses being built during the 1920s and 1930s on what had once been open fields.
-Even during the expansion of the motor industry in the 1920s and 1930s, the factories of firms such as Standard-Triumph, Lea Francis and Alvis were still only just outside the city centre. Part of the reason why so much of Coventry was destroyed or badly damaged during 1940 was that the Luftwaffe's industrial targets were right in the middle of the city. +As in many towns, the 20th century saw not only a massive increase in population but also the urban middle classes moving out from the town or city centre into these newly developed suburbs and commuting to work by bus, tram or even car.
-It is only since the 1960s that Coventry's car industry and its surviving car factories (Jaguar, Peugeot-Citröen, along with Alvis, makers of military vehicles, and Rolls-Royce Aero-engines) have moved to the outskirts of the city. +Coventry's car industry grew out of light engineering, especially sewing machine and bicycle manufacture. Paradoxically, it is much harder to find the physical evidence of these early, small factories than it is for earlier industry. Many of these factories were built only just outside the city centre, cheek by jowl, with terraced housing built at the same time.
-Redevelopment in the 20th century +Even during the expansion of the motor industry in the 1920s and 1930s, the factories of firms such as Standard-Triumph, Lea Francis and Alvis were still only just outside the city centre. Part of the reason why so much of Coventry was destroyed or badly damaged during 1940 was that the Luftwaffe's industrial targets were right in the middle of the city.
-If you were to stand in Broadgate, in the city centre, almost everything in sight dates from the 1950s or later. You can still see the highly innovative pedestrian shopping precinct built during the 1950s and 1960s. -On the horizon are the tower blocks from the 1960s and 1970s and the final phase of the expansion of suburban Coventry. Places such as Allesley Park, with its modern semi-detached houses, also date from the post-war period. +It is only since the 1960s that Coventry's car industry and its surviving car factories (Jaguar, Peugeot-Citröen, along with Alvis, makers of military vehicles, and Rolls-Royce Aero-engines) have moved to the outskirts of the city.
-Yet the view from Broadgate has also been one of continuous change since the war. Large parts of the 1960s precincts have been demolished to make way for more recent shopping centres, while those factories which were still centrally located in the 1980s, such as the Alvis works, have now moved out beyond the edges of the city and been replaced with retail parks. +

Redevelopment in the 20th century

-Although the damage done by the Luftwaffe in 1940 was considerable, Coventry's post-war experience is shared by many other towns and cities. As with most towns and cities, the arrival of the motor vehicle has meant that narrow streets built in the medieval or early modern periods were simply inadequate to cope with ever increasing levels of traffic. This has led to the replanning of city centre road systems to cope with this traffic, and in many cases, the building of ring-roads and bypasses. +If you were to stand in Broadgate, in the city centre, almost everything in sight dates from the 1950s or later. You can still see the highly innovative pedestrian shopping precinct built during the 1950s and 1960s.
+On the horizon are the tower blocks from the 1960s and 1970s and the final phase of the expansion of suburban Coventry. Places such as Allesley Park, with its modern semi-detached houses, also date from the post-war period.
-Where to go next +Yet the view from Broadgate has also been one of continuous change since the war. Large parts of the 1960s precincts have been demolished to make way for more recent shopping centres, while those factories which were still centrally located in the 1980s, such as the Alvis works, have now moved out beyond the edges of the city and been replaced with retail parks.
-Although there is no such thing as a typical British town or city, many aspects of Coventry's history are mirrored in other urban centres: its medieval origins; its expansion as an industrial centre in the 19th and 20th centuries; and its redevelopment since the war, with traditional industries giving way to new technology-based industries and retail complexes. -For anyone interested in looking at their town or city, it is these themes that may provide a way into urban history - perhaps the history of the suburb in which you live, an industry associated with your family or the town's social infrastructure, such as its schools or hospitals. +Although the damage done by the Luftwaffe in 1940 was considerable, Coventry's post-war experience is shared by many other towns and cities. As with most towns and cities, the arrival of the motor vehicle has meant that narrow streets built in the medieval or early modern periods were simply inadequate to cope with ever increasing levels of traffic. This has led to the replanning of city centre road systems to cope with this traffic, and in many cases, the building of ring-roads and bypasses.
-In addition to the physical record, there are a vast array of documentary sources to look at: school log-books, medieval court records, monastic records, probate records (wills), company accounts, Ordnance Survey maps, deposited plans, diaries and antiquarian papers, as well as the records produced by central and local government. +

Where to go next

-As with any research, rather than just plunging in, read what other historians have said about your topic and get some sense of the things to look at and the sources to use. Most modern histories of towns and cities, such as those produced by the Victoria County History, will have a detailed list of the sources used and where they can be found. +Although there is no such thing as a typical British town or city, many aspects of Coventry's history are mirrored in other urban centres: its medieval origins; its expansion as an industrial centre in the 19th and 20th centuries; and its redevelopment since the war, with traditional industries giving way to new technology-based industries and retail complexes.
+For anyone interested in looking at their town or city, it is these themes that may provide a way into urban history - perhaps the history of the suburb in which you live, an industry associated with your family or the town's social infrastructure, such as its schools or hospitals.
-You will have to visit a number of different places to search for sources, although your first port of call is likely to be the local city or county record office. +In addition to the physical record, there are a vast array of documentary sources to look at: school log-books, medieval court records, monastic records, probate records (wills), company accounts, Ordnance Survey maps, deposited plans, diaries and antiquarian papers, as well as the records produced by central and local government.
-The disappearing past +As with any research, rather than just plunging in, read what other historians have said about your topic and get some sense of the things to look at and the sources to use. Most modern histories of towns and cities, such as those produced by the Victoria County History, will have a detailed list of the sources used and where they can be found.
-In any town or city, the old and the new stand next to each other. As towns and cities continually evolve and are developed, the old, sadly, often makes way for the new. -Much of the Victorian terraced housing in the city centre survived the bombing of 1940, only to be demolished afterwards to make way for the replanning of the city centre. Now only one street of Victorian terraces, Starley Road, remains within the ring road and only a long campaign by its residents prevented its demolition in the 1980s. +You will have to visit a number of different places to search for sources, although your first port of call is likely to be the local city or county record office.
-Much of the urban history we can see today will eventually be lost, so get out now and take advantage of it and explore the buildings of your town or city. Next time you walk to the shops, or to the bus stop, or to work, look up and around. +

The disappearing past

+ +In any town or city, the old and the new stand next to each other. As towns and cities continually evolve and are developed, the old, sadly, often makes way for the new.
+Much of the Victorian terraced housing in the city centre survived the bombing of 1940, only to be demolished afterwards to make way for the replanning of the city centre. Now only one street of Victorian terraces, Starley Road, remains within the ring road and only a long campaign by its residents prevented its demolition in the 1980s.
+ +Much of the urban history we can see today will eventually be lost, so get out now and take advantage of it and explore the buildings of your town or city. Next time you walk to the shops, or to the bus stop, or to work, look up and around.
+ \ No newline at end of file diff --git a/exercises/03_html/01_syntax/package.json b/exercises/03_html/01_syntax/package.json index 701e1350..fa261ede 100644 --- a/exercises/03_html/01_syntax/package.json +++ b/exercises/03_html/01_syntax/package.json @@ -11,6 +11,6 @@ "dependencies": { "koa": "^2.6.2", "koa-router": "^7.4.0", - "koa-views": "^6.1.5" + "koa-views": "^6.2.1" } } diff --git a/exercises/03_html/02_lists/computers80.html b/exercises/03_html/02_lists/computers80.html index db0b7b45..7ca3d24a 100644 --- a/exercises/03_html/02_lists/computers80.html +++ b/exercises/03_html/02_lists/computers80.html @@ -22,6 +22,14 @@

Clever uses

Legendary computers

The best known computer of the eighties was Commodore 64, but there are other computers that gained popularity.

+

Some reasons often mentioned were:

+ +
    +
  1. learning to write computer programs
  2. +
  3. managing family finances
  4. +
  5. keeping track of freezer contents
  6. +
+

Read the Wikipedia article for Retrocomputing.

Key concepts

@@ -31,6 +39,38 @@

Key concepts

Your browser does not support the audio element. +

There are two types of memory:

+ +
+
RAM
+
Random access memory. The memory usable by programs. The amount was + typically in the ballpark of 20 to 64 kilobytes. However, the Basic + interpreter by default consumed a part of this.
+ +
ROM
+
Read-only memory. This was normally smaller in size than RAM and + roughly corresponded to the hardware implementation of the operating + system.
+
+ +

Uses of modern computers

+

Computers have many modern uses. Some of the most important are:

+
    +
  1. Medical equipment
  2. +
  3. Government
  4. +
  5. Business tools
  6. +
  7. Education
  8. +
+ +

ZX80 computer components

+
+
CPU (central processing unit)
+
The CPU performs arithmetic and logic operations on data and controls I/O operations.
+
RAM
+
The ZX80 had only 1 KB of RAM, which was used to hold programs and data that were being used or recently used.
+
ROM
+
Read-only memory held the operating system. It is read-only as it shouldn't be changed.
+
diff --git a/exercises/03_html/02_lists/package.json b/exercises/03_html/02_lists/package.json index c0e25a75..0edfd34b 100644 --- a/exercises/03_html/02_lists/package.json +++ b/exercises/03_html/02_lists/package.json @@ -12,6 +12,6 @@ "koa": "^2.6.2", "koa-router": "^7.4.0", "koa-static": "^5.0.0", - "koa-views": "^6.1.5" + "koa-views": "^6.2.1" } } diff --git a/exercises/03_html/03_hypermedia/index.js b/exercises/03_html/03_hypermedia/index.js index a56923c3..a48d0ef2 100644 --- a/exercises/03_html/03_hypermedia/index.js +++ b/exercises/03_html/03_hypermedia/index.js @@ -13,6 +13,8 @@ app.use(views(`${__dirname}/views`, { extension: 'html' }, {map: { handlebars: ' router.get('/', async ctx => await ctx.render('index')) router.get('/commodore', async ctx => ctx.render('commodore64')) router.get('/paradoxes', async ctx => ctx.render('paradoxes')) +router.get('/cathedral', async ctx => ctx.render('cathedral')) +router.get('/spectrum', async ctx => ctx.render('spectrum')) router.get('/date', async ctx => { const today = new Date() @@ -22,5 +24,14 @@ router.get('/date', async ctx => { ctx.body = `

The date is: ${dd}/${mm}/${yyyy}` }) +router.get('/time', async ctx => { + const today = new Date() + const hh = today.getHours() + const mm = today.getMinutes() + ctx.body = `

The time is ${hh}:${mm}` + + +}) + app.use(router.routes()) module.exports = app.listen(port, () => console.log(`listening on port ${port}`)) diff --git a/exercises/03_html/03_hypermedia/package.json b/exercises/03_html/03_hypermedia/package.json index b86d93c6..4401689d 100644 --- a/exercises/03_html/03_hypermedia/package.json +++ b/exercises/03_html/03_hypermedia/package.json @@ -12,6 +12,6 @@ "koa": "^2.6.2", "koa-router": "^7.4.0", "koa-static": "^5.0.0", - "koa-views": "^6.1.5" + "koa-views": "^6.2.1" } } diff --git a/exercises/03_html/03_hypermedia/public/guitar.mp3 b/exercises/03_html/03_hypermedia/public/audio/guitar.mp3 similarity index 100% rename from exercises/03_html/03_hypermedia/public/guitar.mp3 rename to exercises/03_html/03_hypermedia/public/audio/guitar.mp3 diff --git a/exercises/03_html/03_hypermedia/public/guitar.ogg b/exercises/03_html/03_hypermedia/public/audio/guitar.ogg similarity index 100% rename from exercises/03_html/03_hypermedia/public/guitar.ogg rename to exercises/03_html/03_hypermedia/public/audio/guitar.ogg diff --git a/exercises/03_html/03_hypermedia/public/coventry.mp5 b/exercises/03_html/03_hypermedia/public/coventry.mp5 deleted file mode 100644 index f5ce2d2d..00000000 Binary files a/exercises/03_html/03_hypermedia/public/coventry.mp5 and /dev/null differ diff --git a/exercises/03_html/03_hypermedia/public/images/BBC_Micro_Front_Restored.jpg b/exercises/03_html/03_hypermedia/public/images/BBC_Micro_Front_Restored.jpg new file mode 100644 index 00000000..afb36112 Binary files /dev/null and b/exercises/03_html/03_hypermedia/public/images/BBC_Micro_Front_Restored.jpg differ diff --git a/exercises/03_html/03_hypermedia/public/images/C64-left.jpg b/exercises/03_html/03_hypermedia/public/images/C64-left.jpg new file mode 100644 index 00000000..f5b6ae76 Binary files /dev/null and b/exercises/03_html/03_hypermedia/public/images/C64-left.jpg differ diff --git a/exercises/03_html/03_hypermedia/public/images/ZXSpectrum48k.jpg b/exercises/03_html/03_hypermedia/public/images/ZXSpectrum48k.jpg new file mode 100644 index 00000000..b585f7ef Binary files /dev/null and b/exercises/03_html/03_hypermedia/public/images/ZXSpectrum48k.jpg differ diff --git a/exercises/03_html/03_hypermedia/public/images/comp.jpg b/exercises/03_html/03_hypermedia/public/images/comp.jpg new file mode 100644 index 00000000..a5d4d44f Binary files /dev/null and b/exercises/03_html/03_hypermedia/public/images/comp.jpg differ diff --git a/exercises/03_html/03_hypermedia/public/coventry.ogv b/exercises/03_html/03_hypermedia/public/video/coventry.ogv similarity index 100% rename from exercises/03_html/03_hypermedia/public/coventry.ogv rename to exercises/03_html/03_hypermedia/public/video/coventry.ogv diff --git a/exercises/03_html/03_hypermedia/views/commodore64.html b/exercises/03_html/03_hypermedia/views/commodore64.html index 7efb89be..648c11d8 100644 --- a/exercises/03_html/03_hypermedia/views/commodore64.html +++ b/exercises/03_html/03_hypermedia/views/commodore64.html @@ -4,6 +4,14 @@ - +
+ Commodore 64 +
Commoder 64. Photo: http://oldcomputers.net/c64.html.
+
+

Read the Wikipedia article for Retrocomputing.

+ + + Back + \ No newline at end of file diff --git a/exercises/03_html/03_hypermedia/views/index.html b/exercises/03_html/03_hypermedia/views/index.html index 3659c4ce..b0357036 100644 --- a/exercises/03_html/03_hypermedia/views/index.html +++ b/exercises/03_html/03_hypermedia/views/index.html @@ -8,9 +8,36 @@ -

Retro Computers

+ +

Retro Computers

+
+ Apple Macintosh 512K +
Apple Macintosh 512K. Photo: https://www.pcgamer.com/personal-computers-1980s/.
+
    -
  1. Commodore 64
  2. -
+
  • Commodore 64.
  • +
  • ZX Spectrum.
  • + + +
    +
    Listen to the guitar:
    + +
    + +
    +
    Watch the Coventry video:
    + +
    + + + \ No newline at end of file diff --git a/exercises/03_html/03_hypermedia/views/spectrum.html b/exercises/03_html/03_hypermedia/views/spectrum.html new file mode 100644 index 00000000..ac66eede --- /dev/null +++ b/exercises/03_html/03_hypermedia/views/spectrum.html @@ -0,0 +1,31 @@ + + + + Sinclair ZX Spectrum + + +

    Sinclair ZX Spectrum

    +
    + ZX Spectrum +
    ZX Spectrum. Photo: https://en.wikipedia.org/wiki/ZX_Spectrum.
    +
    +

    History

    +

    The ZX Spectrum is an 8-bit personal home computer released in the United Kingdom in 1982 by Sinclair Research.

    + +

    Current status

    +

    There's still a wide community of Specrum enthusiasts. There are numerous emulators, such as Fuse and Speecy.

    + +

    Gaming device

    +

    Best games

    +

    The ZX Spectrum was famous for its games. Some of the best include:

    +
    +
    Jet Set Willy
    +
    contained 60 levels
    +
    The Hobbit
    +
    A text adventure game with some simple graphics
    +
    + + + Back to Main page + + \ No newline at end of file diff --git a/exercises/03_html/04_tables/comparison.html b/exercises/03_html/04_tables/comparison.html index 42b0dda9..32664363 100644 --- a/exercises/03_html/04_tables/comparison.html +++ b/exercises/03_html/04_tables/comparison.html @@ -17,6 +17,7 @@ Commodore 64 ZX Spectrum Commodore VIC-20 + Spectravideo SV-38 @@ -25,18 +26,31 @@ MOS Technology 6510 Zilog Z80 MOS Technology 6502 + Zilog Z80A RAM 64 kilobytes 16 or 64 kilobytes 5 kilobytes + 64kB ROM 20 kilobytes 16 kilobytes 16 kilobytes + 32kB + + + + Main usage: home computing + + + + Jet Set Willy + Jelly Monsters + Armoured Assault diff --git a/exercises/03_html/04_tables/package.json b/exercises/03_html/04_tables/package.json index f086c161..f3b25ec2 100644 --- a/exercises/03_html/04_tables/package.json +++ b/exercises/03_html/04_tables/package.json @@ -12,6 +12,6 @@ "koa": "^2.6.2", "koa-router": "^7.4.0", "koa-static": "^5.0.0", - "koa-views": "^6.1.5" + "koa-views": "^6.2.1" } }